bsd-1-0-0-20000530-merge
fb744b47 · Merged trunk into bsd-1-0-0-branch · May 30, 2000