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

[Than Ngo]

commit 83396d6f4be3489e69aa6fae24845a961029a0fe
Merge: 243fdbe 3bdc614
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:49:16 2012 +0100

    Merge branch 'f18' into f17

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