[MERGE] merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Wed, 24 Nov 2010 07:01:14 +0000 (12:31 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Wed, 24 Nov 2010 07:01:14 +0000 (12:31 +0530)
bzr revid: psi@tinyerp.co.in-20101124070114-fb2hb3mtlwxr48yl


Trivial merge