I've merged robert's integration branch into bzr.dev, up to r1208. This includes lalo's cleanup of Branch constructors, which seems to break some plugins. Perhaps we should put the old ones back in as deprecated functions. -- Martin