[kate/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit 450cd2e934a9e1336d07ae9dae66aeb07ce8cfe5
Merge: b337caa 63319b3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 16:46:28 2012 -0500

    Merge branch 'master' into f16

 .gitignore |    4 +---
 kate.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---