[kdeplasma-addons/f18: 17/17] Merge branch 'master' into f18

[Rex Dieter]

commit f5fa5df3ef3f0d94e0c026c08b9db3d7eaeeefa7
Merge: dcee82e cb47972
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 11:30:17 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdeplasma-addons.spec
    	sources

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