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

[Rex Dieter]

commit f02d0125ef904f27281f1b5c889f438e2195cd24
Merge: ef755da bf226be
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 15:39:49 2012 -0500

    Merge branch 'f17' into f16

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