[marble/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit 3c516a766f13c13ae16beba702927e83c69c2f5b
Merge: beb4602 2410bf6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:20:30 2012 -0500

    Merge branch 'master' into f16

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