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

[Rex Dieter]

commit a6feb93882a1cf72a6988de29dd2de0a6f4db342
Merge: 59bd4fc 51168b5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:22:02 2012 -0500

    Merge branch 'master' into f16

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