[MERGE]:lp:~openerp-dev/openobject-addons/trunk-mrp-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 11:29:17 +0000 (16:59 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 11:29:17 +0000 (16:59 +0530)
bzr revid: apa@tinyerp.com-20120427112917-eh1czpxg1lkh0cvt


Trivial merge