Fixes around m4 from trunk
authorBrian Aker <brian@tangent.org>
Sun, 12 Feb 2012 19:30:02 +0000 (11:30 -0800)
committerBrian Aker <brian@tangent.org>
Sun, 12 Feb 2012 19:30:02 +0000 (11:30 -0800)

Trivial merge