[kalzium/f16: 10/10] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 6cfb7e179a9deba064214813f11852298f19bdda
Merge: f6de78e c8701e5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:22:26 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kalzium.spec
    	sources

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