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

[Rex Dieter]

commit 9338706f2f5cf96f5e5d6b68a3eece66a100ce96
Merge: 1954ee3 ef3fd71
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:03:06 2012 -0500

    Merge branch 'master' into f16

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