[MERGE]: Merge with latest trunk-addons
authorRucha (Open ERP) <rpa@tinyerp.com>
Mon, 14 Nov 2011 05:38:19 +0000 (11:08 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Mon, 14 Nov 2011 05:38:19 +0000 (11:08 +0530)
bzr revid: rpa@tinyerp.com-20111114053819-xkztyd5wk6kr5sn6

1  2 
addons/mrp/mrp.py
addons/mrp/mrp_view.xml

Simple merge
Simple merge