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

[Rex Dieter]

commit b3072b3240733fa7b96d367cb27ac276f165512c
Merge: eb570cc 555d15b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:41:19 2012 -0600

    Merge branch 'f18' into f17

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