[ark/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit ec2c428af61f8810ff2493723c6e6a45755c1de8
Merge: c84886a 1fc2ac2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:03:42 2013 -0500

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	ark.spec
    	sources

 .gitignore |    6 +++++-
 ark.spec   |   28 +++++++++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 31 insertions(+), 5 deletions(-)
---