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

[Than Ngo]

commit 3f1fab815b1062f2ad27ee382223ca4c1b3039c9
Merge: 81922a4 829076b
Author: Than Ngo <than at redhat.com>
Date:   Mon Apr 2 14:13:20 2012 +0200

    Merge branch 'master' into f16

 konsole-4.8.1-kde#280896.patch   |   62 --------------------------------------
 konsole-4.8.2-kdebug297156.patch |   26 ----------------
 konsole.spec                     |   13 ++-----
 sources                          |    2 +-
 4 files changed, 5 insertions(+), 98 deletions(-)
---