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

[Rex Dieter]

commit eb570cc0da27b5809c333f544bd08bbde4fa5dde
Merge: 4fa6de9 df178c3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 4 13:18:43 2012 -0500

    Merge branch 'f18' into f17

 ...E-as-working-directory-through-the-.deskt.patch |   33 ++++++++++++++++++++
 konsole.spec                                       |   10 +++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---