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

[Rex Dieter]

commit dba30e110cf76428c2bf6541e56aa8bd2d6f4779
Merge: 44d10a8 6ca3c78
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:12:45 2012 -0500

    Merge branch 'f18' into f17

 marble.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---