[ark/f18: 3/3] Merge branch 'master' into f18

[Rex Dieter]

commit c5bdc8c0b5cf2c872f6c0f4da80b816feb481df8
Merge: df3db2a faf1b5f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue May 7 21:04:14 2013 -0500

    Merge branch 'master' into f18

 .gitignore |    1 +
 ark.spec   |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---