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

[Rex Dieter]

commit fc815dad55c64a4bbc640fd9a6fbab55e90f0851
Merge: b68ac82 dacc63d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 7 12:06:44 2013 -0600

    Merge branch 'f18' into f17

 .gitignore   |    5 +----
 konsole.spec |   21 ++++++++++++++++++---
 sources      |    2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)
---