[kalgebra/f17: 11/11] Merge branch 'master' into f17

[Rex Dieter]

commit b2bfb71b0a1bc5c492060d1b5b3cbf87cad7f6f0
Merge: 13912a2 dd3ab73
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 7 12:41:57 2012 -0500

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

 .gitignore    |    3 +--
 kalgebra.spec |   29 +++++++++++++++++++++--------
 sources       |    2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)
---