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

[Rex Dieter]

commit 4cf3f373f9e131c68423bcd29bbbcab23e42af0d
Merge: f6f4d45 e9a3706
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:04:51 2012 -0500

    Merge branch 'master' into f16

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