[ruby-korundum/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit e91ff134a869780a61bf9f8267f5aa838552e0f0
Merge: cd59154 edc3bc9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 18:35:44 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	ruby-korundum.spec
    	sources

 .gitignore         |    5 +----
 ruby-korundum.spec |   23 ++++++++++++++++++-----
 sources            |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---