[kdeplasma-addons/f16: 7/7] Merge remote-tracking branch 'origin/master' into f16

[Rex Dieter]

commit 6934e97f589f47dd9198754edc24fe58353f8688
Merge: 8d91f34 8e9f3b3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 16 15:34:40 2011 -0500

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	kdeplasma-addons.spec

 .gitignore                               |    1 +
 kdebase-workspace-4.7.0-kde#278222.patch |   69 ------------------------------
 kdeplasma-addons.spec                    |   21 +++++----
 sources                                  |    2 +-
 4 files changed, 14 insertions(+), 79 deletions(-)
---