Merge remote-tracking branch 'nsz/bsd'
authorRich Felker <dalias@aerifal.cx>
Tue, 14 Aug 2012 01:55:35 +0000 (21:55 -0400)
committerRich Felker <dalias@aerifal.cx>
Tue, 14 Aug 2012 01:55:35 +0000 (21:55 -0400)

Trivial merge