[kdelibs/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit 07c69db5c5331aa80cf14bd7d165184b08afdae1
Merge: a73f58c 93ce084
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Nov 4 10:49:10 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	kdelibs.spec

 kdelibs.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---