[kdepim-runtime/f18: 11/11] Merge branch 'master' into f18

[Rex Dieter]

commit 99ec914ef2fc5e5e28f15002715b803e9f6fcaa7
Merge: 59fc322 bed8aaa
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 11:31:21 2013 -0600

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

 .gitignore          |    7 +------
 kdepim-runtime.spec |   40 ++++++++++++++++++++++++++++++++++------
 sources             |    2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)
---