[MERGE] merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Fri, 28 May 2010 10:26:01 +0000 (15:56 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Fri, 28 May 2010 10:26:01 +0000 (15:56 +0530)
commitdf72e9b29d08f3d497a4fab8e0fb7df2e8cd3a8c
treea54df5fa9e02e1f2ffebb4085ed24d643fc4c69f
parent8eb8507424bcb72b2f03de95e78561e68c149be5
parentd656c5bb0ba8e06cead91a15f62ff84e39052eec
[MERGE] merge with dev-addons3 branch

bzr revid: psi@tinyerp.co.in-20100528102601-6i93mta2q4kk4mod