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

[Rex Dieter]

commit 7ed3a9363befae0418798a8f9dc54639a042a42b
Merge: 3c39ea9 68ae413
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 13:30:01 2012 -0500

    Merge branch 'f18' into f17

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