[kde-plasma-daisy/f13/master: 4/4] Merge branch 'master' into f13

[Julian Aloofi]

commit 8ec24a3ca6e215846583c47cae35527113a21a44
Merge: 2bbd988 38ead1c
Author: Julian Aloofi <julian.fedora at googlemail.com>
Date:   Sat Nov 20 17:18:31 2010 +0100

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

 .gitignore            |    1 +
 kde-plasma-daisy.spec |   12 +++++++++---
 sources               |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---