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

[Rex Dieter]

commit 0c5cd80b9b88b64913b95e9d26209624c2d9e284
Merge: 672a89c cde37ee
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:02:52 2012 -0500

    Merge branch 'master' into f16

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