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)

Trivial merge