[MERGE] merge with dev addons3
authorpsi (Open ERP) <psi@tinyerp.co.in>
Wed, 5 Jan 2011 06:17:07 +0000 (11:47 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Wed, 5 Jan 2011 06:17:07 +0000 (11:47 +0530)
commit57a98878b7111779d769b8be71517a078baf2fe3
tree26b637a79d62d80beea0c2aef1bb08a70bb4429b
parent63e8f6738fef5083d212bb3f45aeda738d053e50
parenta124598535c50d422ad146b4d17ee505eee2337b
[MERGE] merge with dev addons3

bzr revid: psi@tinyerp.co.in-20110105061707-jbc0i1bzkn7h381k