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

[Than Ngo]

commit 72993e972f3593d7b14be8d7724f6122822c7ea0
Merge: 10fda87 435dac4
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:34:06 2012 +0100

    Merge branch 'f18' into f17

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