[MERGE] merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 8 Jun 2010 06:22:45 +0000 (11:52 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 8 Jun 2010 06:22:45 +0000 (11:52 +0530)
bzr revid: psi@tinyerp.co.in-20100608062245-lsqqcuqgi2aifq31


Trivial merge