[kdepim-runtime/f17: 18/18] Merge branch 'master' into f17

[Rex Dieter]

commit ced80d99409919d956045cf0bcc37eb65ab5c621
Merge: 56b4238 2e46e2e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 12:12:49 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kdepim-runtime.spec
    	sources

 .gitignore                                   |    4 +-
 0001-add-sqlite-support-to-akonadi-kcm.patch |   79 --------------------------
 kdepim-runtime.spec                          |   68 ++++++++++++++++-------
 sources                                      |    2 +-
 4 files changed, 50 insertions(+), 103 deletions(-)
---