[konsole/f16: 15/15] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 59bd4fc2bb9b58f68ea21e34ebfe36edc04b05bf
Merge: 9e527ab c53bf2e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 22:30:06 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	konsole.spec
    	sources

 .gitignore                        |    3 +-
 konsole-4.7.95-kdebug280896.patch |   12 ---------
 konsole-4.8.0-kdebug280896.patch  |   21 ++++++++++++++++
 konsole.spec                      |   47 +++++++++++++++++++++++++++++-------
 sources                           |    2 +-
 5 files changed, 61 insertions(+), 24 deletions(-)
---