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

[Rex Dieter]

commit 7fbe8c03ee0cc0801f85f6810c0c08135f9572b2
Merge: 7ed3a93 4dfc6d7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 15:26:42 2012 -0600

    Merge branch 'f18' into f17

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