Merge remote branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Tue, 20 Mar 2012 23:51:11 +0000 (19:51 -0400)
committerRich Felker <dalias@aerifal.cx>
Tue, 20 Mar 2012 23:51:11 +0000 (19:51 -0400)

Trivial merge