Merge in locking fixes into the main line.
[mmh] / DATE
1 1 Jul 2003