[kde-plasma-yawp/f12/master: 12/12] Merge branch 'master' into f12

[Orcan Ogetbil]

commit c4792ca551f683a2d623364ebc2d081c05757442
Merge: b9a8f84 71fd007
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Oct 8 23:37:49 2010 -0400

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

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