[kdepimlibs/f14/master: 3/3] Merge branch 'master' into f14

[Rex Dieter]

commit 4c8df917acb2ee01c29f0f0838aa051b3c2863c9
Merge: 2825016 b651efd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 09:10:59 2010 -0500

    Merge branch 'master' into f14

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