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)
commit5d5ab51862cbd010bdf52dc3b04b0967450bcd1a
tree41431acff8952340f256f9eda10524fba048a0d2
parent3c4214db727ed6300b34be28a5428b7abd6598df
parent3159e2fc816f5c56b54f86f38748ba1ff9e18f9f
merge a few fixes by sh4rm4