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

[Rex Dieter]

commit 7acd173a92a5d1b6818b64789a08404ca2082cc5
Merge: 4c8df91 f54ee48
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 2 15:30:25 2010 -0500

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

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