[marble/f16: 23/23] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit beb46023a71ece8d4d482c4b4f607b6f22700893
Merge: 8061559 cab5eee
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 22:28:13 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	marble.spec
    	sources

 .gitignore             |    3 +-
 marble-4.8.0-opt.patch |   71 +++++++++++++++++++++++++++++++++++++++++
 marble.spec            |   82 ++++++++++++++++++++++++++++++++++++++++++-----
 sources                |    2 +-
 4 files changed, 146 insertions(+), 12 deletions(-)
---