Merge remote-tracking branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Sun, 6 May 2012 13:42:23 +0000 (09:42 -0400)
committerRich Felker <dalias@aerifal.cx>
Sun, 6 May 2012 13:42:23 +0000 (09:42 -0400)

Trivial merge