[rocs/f18: 10/10] Merge branch 'master' into f18

[Rex Dieter]

commit e99303beecd3247ad9f868b22e5da8ce76fe1278
Merge: b68c820 17e432a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 09:46:43 2013 -0600

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

 .gitignore |    7 +------
 rocs.spec  |   36 +++++++++++++++++++++++++++---------
 sources    |    2 +-
 3 files changed, 29 insertions(+), 16 deletions(-)
---