[cyrus-imapd/f17: 6/6] Merge branch 'master' into f17

[Jeroen van Meeuwen]

commit 2d18222a049b646f60854034bcdb0f55a4b1444c
Merge: a9b14d7 e8cbb21
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Wed Apr 18 14:15:53 2012 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	cyrus-imapd.spec
    	sources

 .gitignore                       |    1 +
 cyrus-imapd-2.3.15-qos.patch     |   83 --------------------------------
 cyrus-imapd-2.3.16-nodenny.patch |   26 ----------
 cyrus-imapd-perl5.14.patch       |   96 --------------------------------------
 cyrus-imapd.spec                 |   19 ++++---
 sources                          |    2 +-
 6 files changed, 13 insertions(+), 214 deletions(-)
---