[kde-plasma-yawp/f13/master: 9/9] Merge branch 'master' into f13

[Orcan Ogetbil]

commit 046904f62e9871ab1f5a1773e7c329b6be6bbc78
Merge: 3907ab4 71fd007
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Oct 8 23:34:56 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	kde-plasma-yawp.spec
    	sources

 .gitignore           |    1 +
 kde-plasma-yawp.spec |   17 ++++++++++++++++-
 sources              |    2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)
---