bzr revid: fp@tinyerp.com-20100611074419-93biwenk8q1r68em
bzr revid: dsh@tinyerp.com-20100602143627-n0v33g88homb8p70