Merge remote branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Wed, 11 Apr 2012 18:59:36 +0000 (14:59 -0400)
committerRich Felker <dalias@aerifal.cx>
Wed, 11 Apr 2012 18:59:36 +0000 (14:59 -0400)

Trivial merge