[kscd/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit 23ff41beb7ea8f4f9efb3b6065e26b1d63b7a90e
Merge: b6b132f 7b17000
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:42:41 2013 -0500

    Merge branch 'master' into f19

 .gitignore |    5 +++++
 kscd.spec  |   17 ++++++++++++++++-
 sources    |    2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
---