[marble/f17: 3/3] Merge branch 'f18' into f17

[Rex Dieter]

commit 5296505137bf0a34dcbe2159694c5029fdf62b06
Merge: be2c7ac e3eedf4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 21:01:08 2012 -0600

    Merge branch 'f18' into f17

 .gitignore  |    1 +
 marble.spec |    8 +++++++-
 sources     |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---