Merge remote branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Mon, 19 Mar 2012 10:28:22 +0000 (06:28 -0400)
committerRich Felker <dalias@aerifal.cx>
Mon, 19 Mar 2012 10:28:22 +0000 (06:28 -0400)

Trivial merge