[kdeplasma-addons/f13/master: 3/3] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit f651f11752d9a9be3a8e8cc7e575fd64ab9296b5
Merge: 29db1cf 39ec0f1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 10:43:24 2011 -0600

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

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