[kdeplasma-addons/f14/master: 2/2] Merge remote-tracking branch 'origin/master' into f14

[Rex Dieter]

commit 206767e0076c80e694c008eeae2bc9cfe635e7a3
Merge: 5d1d2c9 97295d7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Apr 9 10:07:05 2011 -0500

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

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