[marble/f18: 9/9] Merge branch 'master' into f18

[Rex Dieter]

commit 0c878f88554e56cbea46d2510e5139a0fcf65d37
Merge: e3eedf4 3a027aa
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 3 18:03:59 2013 -0600

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

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