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

[Rex Dieter]

commit 8eda275013e5beb83fee00c3c05552588f63f868
Merge: 3f1fab8 afcece8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 16:48:53 2012 -0500

    Merge branch 'master' into f16

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