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

[Than Ngo]

commit be2c7aca944049ffc8d663cda84e6fd17ab1dc47
Merge: bba50bd 08dccea
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:45:16 2012 +0100

    Merge branch 'f18' into f17

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