Merge remote-tracking branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Fri, 11 May 2012 02:25:14 +0000 (22:25 -0400)
committerRich Felker <dalias@aerifal.cx>
Fri, 11 May 2012 02:25:14 +0000 (22:25 -0400)

Trivial merge