Hi all, I got some help on the bzr list that seems like it's going to help. The history may end up a bit mangled but it will likely not be lost. So please hold off any pushes until a bit later so I don't have to remerge again. thanks f