Merge pull request #171 from rth7680/fixes
authorAnthony Green <green@moxielogic.com>
Fri, 16 Jan 2015 22:32:07 +0000 (17:32 -0500)
committerAnthony Green <green@moxielogic.com>
Fri, 16 Jan 2015 22:32:07 +0000 (17:32 -0500)
Fixes from mainline gcc


Trivial merge