Fixup the last merge. With the locking change t.nested-locking needed updates.
Fixup the last merge.
With the locking change t.nested-locking needed updates.

bk: 50b7b4dbTTHZ1Zc8h_s8jzovgNYA4w
bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper,bitkeeper-scm/bitkeeper