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

[Rex Dieter]

commit 44d10a85e1a261cf1a82da90551b340da05ca938
Merge: 302af06 e275c9a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 15:18:54 2012 -0500

    Merge branch 'master' into f17

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