[imapsync/el6/master: 7/7] Merge branch 'master' into el6

[Nick Bebout]

commit e52a6d85a834e1209c5d11c3fc47badff17fa92c
Merge: dcd0d6e 5a80d27
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Aug 10 21:59:57 2010 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	imapsync.spec
    	sources

 .gitignore    |    2 +-
 imapsync.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 2cda62f,f21901f..6cd6d49
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--imapsync-1.337.tgz
+ imapsync-1.340.tgz