merge directive used was: bzr merge -r 1825..1826 lp:~openerp/openobject-server/old_trunk tested main flows on manufacturing database + French -> no bug found; still will commit a few more commits related to trunk + etree lp bug: https://launchpad.net/bugs/429519 fixed bzr revid: rvalyi@gmail.com-20091028200443-2ciyhqaz7rczdusy