bzr revid: jma@tinyerp.com-20100610133419-fwbc1xp0xoq77n90
bzr revid: mra@tinyerp.com-20100413070635-uqojhuuaed0qdfcb