Changes by: Aleksey Nogin (nogin at cs.caltech.edu)
Date: 2006-03-16 18:28:26 -0800 (Thu, 16 Mar 2006)
Revision: 8922
Log message:

      Hand-merged the "optional .omc locking" change (rev 8892:8895) from the
      0.9.6.x branch.