[kalzium/f18: 11/11] Merge branch 'master' into f18

[Than Ngo]

commit a13e99beab5169d6691dbfb1deccd2db0513e092
Merge: 66f004b b2bd977
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 15:55:02 2013 +0100

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

 .gitignore   |    1 +
 kalzium.spec |   41 ++++++++++++++++++++++++++++++++---------
 sources      |    2 +-
 3 files changed, 34 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index 38fc93e,9f9b79f..58e2dbe
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kalzium-4.8.5.tar.xz
 +/kalzium-4.9.1.tar.xz
 +/kalzium-4.9.2.tar.xz
 +/kalzium-4.9.3.tar.xz
 +/kalzium-4.9.4.tar.xz
 +/kalzium-4.9.5.tar.xz
+ /kalzium-4.10.1.tar.xz