bzr revid: jma@tinyerp.com-20100610133419-fwbc1xp0xoq77n90
bzr revid: dsh@tinyerp.com-20100602143627-n0v33g88homb8p70