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

[Rex Dieter]

commit e4275df17bc91fe216ef5d26c09e5d6629e6c336
Merge: 84570db 8fa5b76
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 15:33:57 2012 -0500

    Merge branch 'f17' into f16

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