Merge remote-tracking branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Sat, 5 May 2012 00:56:01 +0000 (20:56 -0400)
committerRich Felker <dalias@aerifal.cx>
Sat, 5 May 2012 00:56:01 +0000 (20:56 -0400)
commitdac791226a0f6fb8d19d83b63a837254f804dbac
treeb7c399afda1839f977673978e71450fce9451d65
parent4027f4e8f948c26be5e61c774f9f9ce9af8942b5
parentf697d66b81912af59128ac1b96bc0e2a4514b758
Merge remote-tracking branch 'nsz/master'