[kscd/f18: 8/8] Merge branch 'master' into f18

[Rex Dieter]

commit 1341a5a53e996cdfee7d0b663ffdf4adfab14761
Merge: 87b8ff8 9f26bd9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:16:19 2013 -0600

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

 .gitignore |    6 +-----
 kscd.spec  |   22 ++++++++++++++++++----
 sources    |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---