Merge remote-tracking branch 'nsz/review'
authorRich Felker <dalias@aerifal.cx>
Sat, 18 May 2013 16:06:42 +0000 (12:06 -0400)
committerRich Felker <dalias@aerifal.cx>
Sat, 18 May 2013 16:06:42 +0000 (12:06 -0400)

Trivial merge