[MERGE] merge with dev-addons3
authorpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 11 Jan 2011 11:02:12 +0000 (16:32 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 11 Jan 2011 11:02:12 +0000 (16:32 +0530)
bzr revid: psi@tinyerp.co.in-20110111110212-v3j1nuaoukq52xm6


Trivial merge