[konsole/f16: 3/3] Merge branch 'f17' into f16

[Rex Dieter]

commit 4a5b93fff193fda9294813a1799e8af665d6e434
Merge: 8eda275 2c71b64
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 18:59:01 2012 -0500

    Merge branch 'f17' into f16

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