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

[Rex Dieter]

commit 2af2a51dbbadd5619f1d74cc2e0cd5372eaeb735
Merge: 772e6f3 a81b4e6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:55:50 2012 -0500

    Merge branch 'f18' into f17

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