[kalzium/f16: 3/3] Merge branch 'f17' into f16

[Rex Dieter]

commit 9d05a22bf9a5327f5d990684da41e906bf7e3ce2
Merge: fee303e 2b13038
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:13:56 2012 -0500

    Merge branch 'f17' into f16

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