[kdepimlibs/f13/master: 2/2] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 1f06f347da7f581a61b6b1f924318366399422c0
Merge: 36ec0dc 2a53326
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 5 15:26:47 2011 -0600

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

 .gitignore      |    4 +---
 kdepimlibs.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---