[uw-imap/el6: 8/8] Merge branch 'master' into el6

[Rex Dieter]

commit d2d525d6df8d92aa1ecf08376069e6f4fcecad54
Merge: 02616bc 7b45f21
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jun 13 14:44:17 2011 -0500

    Merge branch 'master' into el6

 uw-imap.spec |   78 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 57 insertions(+), 21 deletions(-)
---