[kdepimlibs/f16: 16/16] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 0af1e553a14d3101be7917873cad3d21860a7008
Merge: 8b7e2aa 76294ba
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 17:29:34 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdepimlibs.spec
    	sources

 .gitignore                                         |    2 +-
 kdepimlibs-4.7.3-dovecot_kde249992.patch           |   26 ----------
 ...mlibs-4.7.4-kio_imap_append_without_flags.patch |   34 -------------
 kdepimlibs.spec                                    |   53 +++++++++++++------
 sources                                            |    2 +-
 5 files changed, 38 insertions(+), 79 deletions(-)
---