[ark/f17: 2/2] Merge branch 'master' into f17

[Rex Dieter]

commit cfcbe202f886a501f41b953b15d17827db82a8cc
Merge: 1ec8a8a b118480
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Jun 1 21:13:59 2013 -0500

    Merge branch 'master' into f17

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