bzr revid: nel@tinyerp.com-20100610113726-p9evovfjz59f63kr
bzr revid: nel@tinyerp.com-20100609135334-t4yx5y293gqgv2x9