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

[Rex Dieter]

commit cdb9080a19ae24601fdaf8cec8d7da8217ac9bfb
Merge: e7ef021 c95b5c4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 12:06:58 2011 -0600

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

 .gitignore                                  |    1 +
 kdepim-runtime-4.4.0-show-akonadi-kcm.patch |   15 ---------------
 kdepim-runtime.spec                         |   23 +++++++++--------------
 sources                                     |    2 +-
 4 files changed, 11 insertions(+), 30 deletions(-)
---