[MERGE] branch merged with trunk-menus-improvements-mrp-mtr
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 5 Mar 2012 09:32:00 +0000 (15:02 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 5 Mar 2012 09:32:00 +0000 (15:02 +0530)
bzr revid: mtr@tinyerp.com-20120305093200-zbq1ned7dmd5wjv1


Trivial merge