bzr revid: rpa@tinyerp.com-20120730102352-wv3g29qk556mx5zc
bzr revid: rpa@tinyerp.com-20120725105039-ddyyg5d1x1r2qszj