[perl-Mail-IMAPClient/el6/master: 4/4] Merge branch 'master' into el6

[Nick Bebout]

commit d1e810492a61fbe3e3a2de81c74823ce274e577d
Merge: 5b632aa 5315e1d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Feb 21 14:18:40 2011 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                |    3 ++-
 perl-Mail-IMAPClient.spec |   12 +++++++++---
 sources                   |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---