[kdelibs3/f17: 3/3] Merge branch 'master' into f17

[Than Ngo]

commit c4e68e89c4cd62b70712c282bd390e2bc646747a
Merge: 2d6fc06 b3e9860
Author: Than Ngo <than at redhat.com>
Date:   Wed Apr 4 19:07:04 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	kdelibs3.spec

 kdelibs3.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---