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

[Rex Dieter]

commit c32229a16c29199ccc0c6d5d99ff5d1899c7c2a8
Merge: 6cfb7e1 1042c56
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:55:46 2012 -0500

    Merge branch 'master' into f16

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