tree 384c4e7bd2728b3a8a48351eb00a0bb9364b0407
parent 2d93d6446191def352b8913e859d6104f1398c72
parent 23e6940a2cf101017df33236ebee0fd4e3383172
author Rich Felker <dalias@aerifal.cx> 1344909335 -0400
committer Rich Felker <dalias@aerifal.cx> 1344909335 -0400

Merge remote-tracking branch 'nsz/bsd'