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

[Rex Dieter]

commit 5ed7a36a0c506202fa89203874c79ac33badc88b
Merge: a6feb93 f404983
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Apr 1 17:39:23 2012 -0500

    Merge branch 'master' into f16

 konsole-4.8.2-kdebug297156.patch |   26 ++++++++++++++++++++++++++
 konsole.spec                     |   14 ++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)
---