[mawk/f18: 7/7] Merge branch 'master' into f18

[mmckinst]

commit 2cd7d002cc2d2962f96e3ec53b188a4ad7242a9a
Merge: ce5aca7 a0154fe
Author: Mark McKinstry <mmckinst at nexcess.net>
Date:   Tue Jun 18 20:33:31 2013 -0400

    Merge branch 'master' into f18

 mawk.spec |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
---