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

[Rex Dieter]

commit 519d8fe0485c7117bd764ca6b50866c68df0b86b
Merge: 56eb99c b5973bf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Apr 8 14:04:40 2011 -0500

    Merge remote-tracking branch 'origin/master' into f14/master

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