Merged main onis file from trunk.
[onis.git] / users.conf
2005-04-08 octoMerged r14:17 of trunk to branch..