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

[Rex Dieter]

commit afa31b991341ee8a8bfe50463daa0c1099b4d396
Merge: 9d05a22 b0c8498
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 06:58:41 2012 -0500

    Merge branch 'f17' into f16

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