[PyKDE4/f16: 7/7] Merge branch 'master' into f16

[Rex Dieter]

commit 858e3d56485263f5e18d3fcf6140c44b600c4e4a
Merge: 15e09ae 882fc8f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 4 20:00:38 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	.gitignore
    	PyKDE4.spec
    	sources

 .gitignore  |    3 +--
 PyKDE4.spec |    7 +++++--
 sources     |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---