[konsole/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 4fa6de993a2f8370afd9951ce39381d1b32dad49
Merge: a2baf7e 918c7ec
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:54:26 2012 -0500

    Merge branch 'f18' into f17

 .gitignore                                         |    2 +-
 ...E-as-working-directory-through-the-.deskt.patch |   33 --------------------
 konsole.spec                                       |   11 +++---
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 41 deletions(-)
---