- sync with my cvs
 - convert line endings in man