Merge remote branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Mon, 19 Mar 2012 22:30:35 +0000 (18:30 -0400)
committerRich Felker <dalias@aerifal.cx>
Mon, 19 Mar 2012 22:30:35 +0000 (18:30 -0400)

Trivial merge