[kalzium/f17: 12/12] Merge branch 'master' into f17

[Rex Dieter]

commit 0d89c179afa611af8b7616928066f49929d01a42
Merge: b0c8498 6b74fdd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 7 12:42:58 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kalzium.spec
    	sources

 .gitignore   |    3 +--
 kalzium.spec |   37 +++++++++++++++++++++++++++++++------
 sources      |    2 +-
 3 files changed, 33 insertions(+), 9 deletions(-)
---