[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Fri, 29 Oct 2010 05:24:34 +0000 (10:54 +0530)
committermtr <mtr@mtr>
Fri, 29 Oct 2010 05:24:34 +0000 (10:54 +0530)
commit95ddfdc5675efa6af34bfd87471943207472808a
tree8f7c88353106b62ce8a0368723f25bcdd9e86953
parentd51f706b68cfda77be2274d9dd8d31afcb56e395
parentd32f945515400a457bcf133632c0a1ea49e92f43
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20101029052434-65iz1ts0s2wujxrc