[kdeplasma-addons/f16: 18/18] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit c7b8246093406ae0cbcb6191a1fd8ad3dfe26cd8
Merge: cd6bbc5 df897fc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:23:34 2012 -0600

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

 .gitignore            |    3 +-
 kdeplasma-addons.spec |  344 ++++++++++++++++++++++++++++++++++++++++++-------
 sources               |    2 +-
 3 files changed, 298 insertions(+), 51 deletions(-)
---