[kdepimlibs/f17: 14/14] Merge branch 'master' into f17

[Rex Dieter]

commit ef857b84f56ac298ded245c040123cd56dc4e7a9
Merge: 76ac949 28cad4e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 14:16:30 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kdepimlibs.spec
    	sources

 .gitignore      |    3 +--
 kdepimlibs.spec |   36 ++++++++++++++++++++++++++++++------
 sources         |    2 +-
 3 files changed, 32 insertions(+), 9 deletions(-)
---