[uw-imap/el4: 63/63] Merge remote-tracking branch 'origin/master' into el4

[Rex Dieter]

commit 24fc1b266b69dbcdfe5ecdd881acfa1b4f837063
Merge: f203f30 31c5aaa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 2 22:43:31 2011 -0500

    Merge remote-tracking branch 'origin/master' into el4
    
    Conflicts:
    	.gitignore
    	branch
    	sources
    	uw-imap.spec

 .gitignore                       |    2 +-
 branch                           |    2 +-
 imap-2007e-system_c_client.patch |   17 ++++++
 imap-password.pam                |    5 ++
 sources                          |    2 +-
 uw-imap.spec                     |  102 +++++++++++++++++++++++++++++--------
 6 files changed, 105 insertions(+), 25 deletions(-)
---