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

[Rex Dieter]

commit cfb1dc42b3a5d7c788fcd6d9ad75821f1e6971bd
Merge: 4e7bf1f 2aba77d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 09:40:43 2013 -0600

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

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