added pass-data to print passwd without first line
better svn merger with vim