[MERGE]Merge with lp:~openerp-dev/openobject-addons/trunk-some_typo
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 26 Apr 2012 09:21:33 +0000 (14:51 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 26 Apr 2012 09:21:33 +0000 (14:51 +0530)
commite199e1452bc0e636f3851962f4be2896378b0554
treee2cf69a219f2aa62e4a13abd0d09478a788c973b
parent9e59ce8812bee98f29d362dd019000e1a0e35af9
parentc71446957f8a35bbb4bd2e87e2022ab5c4f48af3
[MERGE]Merge with lp:~openerp-dev/openobject-addons/trunk-some_typo

bzr revid: mma@tinyerp.com-20120426084440-bvo2ij2a054qpj4f
bzr revid: mma@tinyerp.com-20120426092133-wswb5uw42tvwovx4