[kate/f17: 11/11] Merge branch 'master' into f17

[Rex Dieter]

commit 4d25290e81ec6c69ed0c2e7b5c52007e0e528e9a
Merge: 21425d8 4dec866
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 14:40:11 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kate.spec
    	sources

 .gitignore |    3 +--
 kate.spec  |   30 ++++++++++++++++++++++--------
 sources    |    2 +-
 3 files changed, 24 insertions(+), 11 deletions(-)
---