SVN 373
Merge branch 'master' of https://github.com/j123b567/ptpd

Conflicts:
	m4/version.m4