[kalgebra/f18: 9/9] Merge branch 'master' into f18

[Than Ngo]

commit 6072020bcf7d2aad9e06d47f673b757e456cd102
Merge: fcf7634 747bdc3
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 15:39:18 2013 +0100

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

 .gitignore    |    1 +
 kalgebra.spec |   28 +++++++++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 25 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index c798dec,006c89b..7c9812c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kalgebra-4.8.5.tar.xz
 +/kalgebra-4.9.1.tar.xz
 +/kalgebra-4.9.2.tar.xz
 +/kalgebra-4.9.3.tar.xz
 +/kalgebra-4.9.4.tar.xz
 +/kalgebra-4.9.5.tar.xz
+ /kalgebra-4.10.1.tar.xz