[konsole/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit dacc63dd0fba3bfdd9eb6ba8487cdc96833264d1
Merge: c6ebd1c 9320c47
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:33:02 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	konsole.spec
    	sources

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