[rocs/f17: 11/11] Merge branch 'f18' into f17

[Rex Dieter]

commit 981fc0120b3761ca9cae3906f3134c4abdd4b498
Merge: 0b86edc e99303b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 10:26:22 2013 -0600

    Merge branch 'f18' into f17

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