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

[Rex Dieter]

commit b337caaa8228a17421dcdf60dda10e28001337ae
Merge: afe428c 8ce2f88
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 10:54:45 2012 -0500

    Merge branch 'master' into f16

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