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

[Rex Dieter]

commit 4f2bfc2047615d64f4cec4e2b02c9e76d59d4eaf
Merge: 4cf3f37 24615ff
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 23:02:43 2012 -0500

    Merge branch 'master' into f16

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