[qyoto/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit 18e5d06d6735768b84299429ec659c77ddc78355
Merge: 8bf4f95 b7ce590
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 12:21:24 2012 -0500

    Merge branch 'master' into f16

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