bsd-1-0-1-20000613
c2795393 · Merge trunk into bsd-1-0-1-branch. ·