[merge] better CountedLock handling of tokens, and bzrdir takes more responsibility for default file modes

[Martin Pool]

This fixes some nits and adds tests for CountedLock, and makes bzrdir
control the workingtree file modes as it does for other things.

-- 
Martin <http://launchpad.net/~mbp/>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090324-controlfiles.diff
Type: text/x-patch
Size: 18189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090324/d3b2ce52/attachment-0001.bin