[MREGE]: Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1
authorRucha (Open ERP) <rpa@tinyerp.com>
Mon, 14 Feb 2011 11:59:43 +0000 (17:29 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Mon, 14 Feb 2011 11:59:43 +0000 (17:29 +0530)
commite9097e14acf2ce76ae47f4150ef86aea9d283294
treeaadf3eed8b515e00f11c3269a81ecd84a0316bae
parent572224f266766ceb3e4e3ee40ed6ec6217c29a56
[MREGE]: Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1

bzr revid: rpa@tinyerp.com-20110214115943-p9ss7bn09sj0ift1
addons/mrp/mrp.py