[merge] add tests, docs for set_merge_modified; add _must_be_locked

[Aaron Bentley]

Aaron Bentley has voted +1.
Status is now: Approved


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20070226043714.GA29151%40sourcefrog.net%3E