[MERGE] merged from lp:~openerp/openobject-addons/trunk/
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 16 Mar 2010 06:38:22 +0000 (12:08 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 16 Mar 2010 06:38:22 +0000 (12:08 +0530)
commitdc22a6a8e4a557208c449993a049a943d9cf6390
treea4ab2f24b16f5c07538c5d3567cb4933aa7bc0e2
parentdb8054049be4b9786af9871b225cb5ecfe8232fb
parentb1ccfa683de3875c62e044c71131b910d1851593
[MERGE] merged from lp:~openerp/openobject-addons/trunk/

bzr revid: hmo@tinyerp.com-20100315063749-trpjohgz9w9vcbu9
bzr revid: hmo@tinyerp.com-20100316063822-wzv7qggdi6makx94
addons/mrp/mrp_view.xml