[MERGE] Merged with main branch
authorpso (OpenERP) <pso@tinyerp.com>
Mon, 20 Aug 2012 11:34:18 +0000 (17:04 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Mon, 20 Aug 2012 11:34:18 +0000 (17:04 +0530)
commitc1eb43264932128e1532f7262cf8118e6fddbc16
tree3f00c363565de60de793ef0a27ede2fef5020893
parent20392f65dc4b76d59b7e50b7c513f337c1ac5be0
parent9988c468f9bf6294161ed4dcf198a221600a709c
[MERGE] Merged with main branch

bzr revid: pso@tinyerp.com-20120820113418-60k501hs6y0lpaxz