christos 167c74f464 resolve conflicts

2014-10-24 18:27:12 +00:00

..

dist

resolve conflicts

2014-10-24 18:27:12 +00:00

openpam2netbsd

…