Interpatch diff with main changes

[Sebastian Spaeth]

A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/offlineimap-project/attachments/20110331/02100a83/attachment.sig>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: interpatch.diff
Type: text/x-diff
Size: 3092 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/offlineimap-project/attachments/20110331/02100a83/attachment-0002.diff>