[MERGE]:merged with trunk
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 4 Jul 2012 08:46:02 +0000 (14:16 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 4 Jul 2012 08:46:02 +0000 (14:16 +0530)
bzr revid: apa@tinyerp.com-20120704084602-7bdvtp45lkfanw70

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

Simple merge
Simple merge