[kdeplasma-addons/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit d572ff796bcba663211d1c11707cbd1d47ac5f8e
Merge: 6934e97 b826fab
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 5 10:32:04 2011 -0500

    Merge branch 'master' into f16

 .gitignore            |    3 +--
 kdeplasma-addons.spec |   46 ++++++++++++++++++----------------------------
 sources               |    2 +-
 3 files changed, 20 insertions(+), 31 deletions(-)
---