[kdepim/f18: 10/10] Merge branch 'master' into f18

[Than Ngo]

commit c40a1c95e4d04a9103302cf7d72bef54636887d5
Merge: 47c6c0a 3a9d8b7
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 12:21:45 2013 +0100

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

 .gitignore                                         |    7 +--
 ...rs.patch => kdepim-4.9.95-install_headers.patch |   55 ++++++++++----------
 kdepim.spec                                        |   30 ++++++++---
 sources                                            |    2 +-
 4 files changed, 53 insertions(+), 41 deletions(-)
---