[claws-mail/f13/master: 3/3] Merge branch 'master' into f13

[Andreas Bierfert]

commit d53c8f6f6c21ae0a28b635930e665a01f6557d48
Merge: 574c09b 68ec207
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Wed Dec 8 21:26:53 2010 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	claws-mail.spec

 claws-mail.spec |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---