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

[Rex Dieter]

commit 8fc41051e6032cba98ba9a99960c3b6b216e79b8
Merge: a872ae0 72a985a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 08:56:14 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdeplasma-addons.spec
    	sources

 .gitignore            |    2 +-
 kdeplasma-addons.spec |   37 ++++++++++++++++++++++++++++++-------
 sources               |    2 +-
 3 files changed, 32 insertions(+), 9 deletions(-)
---