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)
commitb99836f3ad817788002bc0def7e2442341c03414
tree384c4e7bd2728b3a8a48351eb00a0bb9364b0407
parent2d93d6446191def352b8913e859d6104f1398c72
parent23e6940a2cf101017df33236ebee0fd4e3383172
Merge remote-tracking branch 'nsz/bsd'