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

[Rex Dieter]

commit 06f737aea0d1db01028eaa591f4e411cfea6c971
Merge: 69e58b4 8af3cd5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:26:07 2012 -0500

    Merge branch 'f17' into f16

 .gitignore                          |    1 +
 kdeplasma-addons-4.8.3-webkit.patch |   66 +++++++++++++++++++++++++++++++++++
 kdeplasma-addons.spec               |   48 ++++++++++++++++++-------
 sources                             |    2 +-
 4 files changed, 103 insertions(+), 14 deletions(-)
---