[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 27 May 2010 05:15:53 +0000 (10:45 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 27 May 2010 05:15:53 +0000 (10:45 +0530)
commit7023fd499c80843b8c5b53c167fd85f3e9c7a586
treee3a23eba5440effda3ba30a7b9b8b914e94f1273
parent084dc7e91f9a6edca6007c4be26ffd95817b4d26
parent5f936d961cf42db4312a840caedc7be7c18c27cf
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: rpa@tinyerp.com-20100527051553-2qi85cltw4bn5vys