merge a few fixes by sh4rm4
authorRich Felker <dalias@aerifal.cx>
Wed, 19 Dec 2012 18:07:37 +0000 (13:07 -0500)
committerRich Felker <dalias@aerifal.cx>
Wed, 19 Dec 2012 18:07:37 +0000 (13:07 -0500)

Trivial merge