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

[Rex Dieter]

commit 373ef512ef2be227c408b9455461285079989ac6
Merge: 39e11af 73459d9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:52:52 2012 -0500

    Merge branch 'master' into f16

 .gitignore                                   |    1 +
 kdeplasma-addons-4.8.1-kimpanel-ibus15.patch |   55 --------------------------
 kdeplasma-addons.spec                        |   15 ++++---
 sources                                      |    2 +-
 4 files changed, 11 insertions(+), 62 deletions(-)
---