[MERGE] merge with dev addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Fri, 11 Jun 2010 13:19:56 +0000 (18:49 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Fri, 11 Jun 2010 13:19:56 +0000 (18:49 +0530)
commita15b68ac2eada95dff4ca66fbe8c164162264e3c
tree6f80e60e049272d8236f65526c983bbfa267d7cd
parent9f6611c63864bbfc2c58b2e071948febc5c1ac4c
parentd836a3dd2b39dea7b3d802ce275d0ddd5f7cdfc9
[MERGE] merge with dev addons3 branch

bzr revid: psi@tinyerp.co.in-20100611131956-5x8igz6srlwp2upn