[perl-Mail-IMAPClient/el5/master: 21/22] Merge branch 'master' into el5

[Nick Bebout]

commit 387bdaab7e6e9d2ed9ded402d06528749cdb672b
Merge: 057e508 5315e1d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Feb 21 14:20:08 2011 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-Mail-IMAPClient.spec
    	sources

 perl-Mail-IMAPClient.spec |   33 +++++++++++++++++++++++++++++++--
 sources                   |    2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)
---