[kalgebra/f16: 11/11] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 3f3e565144c5df51b1a539d8f45a1e71a8a72c09
Merge: 0aaa161 ef3f462
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:20:50 2012 -0600

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

 .gitignore    |    1 +
 kalgebra.spec |   59 +++++++++++++++++++++++++++++++-------------------------
 sources       |    2 +-
 3 files changed, 35 insertions(+), 27 deletions(-)
---