Merge remote branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Sat, 17 Mar 2012 21:34:30 +0000 (17:34 -0400)
committerRich Felker <dalias@aerifal.cx>
Sat, 17 Mar 2012 21:34:30 +0000 (17:34 -0400)

Trivial merge