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

[Rex Dieter]

commit 035bdbd9cc7ecab2200fb7144baba851f3612b08
Merge: 6986d70 9e72411
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 13:15:17 2013 -0600

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

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