update on stack merging

[Martin Pool]

I have sent off the annotation merge plus fix to pqm.  I'm up to
merging the top of the stacking loom (from
http://people.ubuntu.com/%7Erobertc/baz2.0/shallow-branch/) in to
trunk.  There seem to be a few test failures all the way up the stack;
I'm not sure if any of them are fixed in higher threads so my current
approach is to just try to get the whole thing to work, then merge
that in.  I'll send an incremental patch for whatever Ichange.

-- 
Martin <http://launchpad.net/~mbp/>