[MERGE]merged with 7.0
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Thu, 23 May 2013 07:18:53 +0000 (12:48 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Thu, 23 May 2013 07:18:53 +0000 (12:48 +0530)
commitb203ec812cef6d68276f2415c38ee9063322d3a9
treee7e81f8e162ec345b983d7f0be6a2a1b25c622f0
parent9114185c8536be558fd6dbc0765d1d35b5f8076b
parent55c122c632ea1b0d9840064d8046e633bea72dfe
[MERGE]merged with 7.0

bzr revid: dhr@tinyerp.com-20130523071853-m9yqt1pfs9kxd5sb