[kdebindings/f17: 7/7] Merge branch 'master' into f17

[Rex Dieter]

commit 549881b9d1e33ce9346c4ef5d6c1dcc08a356f7e
Merge: 2751b69 47bdce1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 11:57:40 2012 -0500

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

 kdebindings.spec |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)
---