[kdepim-runtime/f16: 5/5] Merge branch 'master' into f16

[Rex Dieter]

commit d401c477fc0104f3676ab15b42a237e832abf247
Merge: 0c1d503 e0227ca
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 21 08:32:39 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	kdepim-runtime.spec

 .gitignore                                         |    1 -
 0001-Ignore-items-with-empty-remote-ids-here.patch |   36 ++++++++++++++++++++
 kdepim-runtime.spec                                |   24 +++++++++----
 3 files changed, 53 insertions(+), 8 deletions(-)
---