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

Trivial merge