[superkaramba/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit 9ac81e0a4ce7f2326a3d5d6538a4e28aa1f8159b
Merge: 6c70a66 1621682
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 09:43:25 2013 -0600

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

 .gitignore        |    7 +------
 sources           |    2 +-
 superkaramba.spec |   21 ++++++++++++++++++---
 3 files changed, 20 insertions(+), 10 deletions(-)
---