[MERGE] merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Wed, 30 Jun 2010 06:00:44 +0000 (11:30 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Wed, 30 Jun 2010 06:00:44 +0000 (11:30 +0530)
bzr revid: psi@tinyerp.co.in-20100630060044-38d1xwd7wlfseyzm


Trivial merge