[kate/f16: 11/11] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit afe428c5fa256a5ff6ef8a6c04a47be7649d7eea
Merge: 08eb2a1 a002952
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 21:25:57 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kate.spec
    	sources

 .gitignore |    2 +-
 kate.spec  |   37 +++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 33 insertions(+), 8 deletions(-)
---