n the future, would you mind using SVN as your base? 0.11-7 is days (and many many revisions) old now, which makes patch generation very difficult.