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

[Rex Dieter]

commit 3a409cb019cbbd39114996425c5938ac689fbbe4
Merge: 5296505 0c878f8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 7 11:53:32 2013 -0600

    Merge branch 'f18' into f17

 .gitignore              |    7 +----
 marble-4.8.80-opt.patch |   71 -----------------------------------------------
 marble.spec             |   50 +++++++++++++++++++++++++--------
 sources                 |    2 +-
 4 files changed, 40 insertions(+), 90 deletions(-)
---