bzr revid: fp@tinyerp.com-20100621184058-try3rw3m59uc4e55
bzr revid: nel@tinyerp.com-20100614112721-9g2vnueqwyycabm1