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

[Rex Dieter]

commit 10fda8755690c23b3fe0018bcf9ae00c67d6ecf1
Merge: 2af2a51 82d6a64
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:30:32 2012 -0600

    Merge branch 'f18' into f17

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