[MERGE] merge with dev-addons3
authorpsi (Open ERP) <psi@tinyerp.co.in>
Wed, 5 Jan 2011 12:41:39 +0000 (18:11 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Wed, 5 Jan 2011 12:41:39 +0000 (18:11 +0530)
bzr revid: psi@tinyerp.co.in-20110105124139-sf81okp4p30sunan


Trivial merge