Merge remote branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Sun, 25 Mar 2012 04:42:51 +0000 (00:42 -0400)
committerRich Felker <dalias@aerifal.cx>
Sun, 25 Mar 2012 04:42:51 +0000 (00:42 -0400)

Trivial merge