christos 00e56c7477 fix rcsids.		2014-10-25 21:11:37 +00:00
..
dist	fix rcsids.	2014-10-25 21:11:37 +00:00
usr.sbin	merge conflicts	2014-10-25 19:06:33 +00:00
Makefile
ppp2netbsd	merge conflicts	2014-10-25 19:06:33 +00:00