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

[Rex Dieter]

commit d6d005478a9609d842197f7025e305ad8351b230
Merge: d401c47 5d1686f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 4 20:51:04 2011 -0500

    Merge branch 'master' into f16

 .gitignore                                         |    2 +-
 0001-Ignore-items-with-empty-remote-ids-here.patch |   36 --------------------
 kdepim-runtime.spec                                |    9 +++--
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 42 deletions(-)
---