[kdepim-runtime/f13/master: 2/2] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 285d511fd4d05b081e8f46cb2caf01e4ff2a24b7
Merge: cdb9080 4de7dd5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Feb 5 09:05:59 2011 -0600

    Merge remote branch 'origin/f14/master' into f13/master

 .gitignore          |    1 +
 kdepim-runtime.spec |    5 ++++-
 sources             |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---