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

[Rex Dieter]

commit f292170044f5a8cd7bee8d86b1b3b4bb66e5c8eb
Merge: 768ff98 ebd1dcb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 13:24:36 2012 -0500

    Merge branch 'f17' into f16

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