[claws-mail/el6/master: 2/2] Merge branch 'master' into el6

[Andreas Bierfert]

commit eb3c7a5119578505906e8ad5c5b58ab56e84df9c
Merge: 3a42f69 e341a22
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon Jan 24 17:09:05 2011 +0100

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

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