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

[Rex Dieter]

commit beed68b826e41d8cf5068eb29f1b662039d455b2
Merge: d572ff7 9a62c52
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Nov 4 13:23:12 2011 -0500

    Merge branch 'master' into 16

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