[qyoto/f18: 8/8] Merge branch 'master' into f18

[Rex Dieter]

commit 3f45675ded1be72f628b8d3fa604af7dea440003
Merge: eefd1b6 cb6e6c5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 3 18:23:54 2013 -0600

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

 .gitignore |    7 +------
 qyoto.spec |   26 +++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 23 insertions(+), 12 deletions(-)
---