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

[Rex Dieter]

commit 84570db1d6b82e5d33a8bb1bb4b01cf75460dd0b
Merge: 18e5d06 562a997
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 19:18:39 2012 -0500

    Merge branch 'master' into f16

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