[perl-Mail-IMAPClient/f13/master: 2/2] Merge branch 'master' into f13

[Nick Bebout]

commit fbb3f3168615a7a8b84e41fdcf59f20ba9eafe39
Merge: 3e520cf 50a2245
Author: Nick Bebout <nb at desktop.bebout.net>
Date:   Wed Mar 16 22:13:13 2011 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

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