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

[Rex Dieter]

commit 6f51783f8b4b7c409f90692f40384fff82d9d092
Merge: c323aaf e958832
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:37:39 2013 -0600

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

 .gitignore  |    7 +------
 kmouth.spec |   21 ++++++++++++++++++---
 sources     |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---