[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Wed, 24 Nov 2010 05:14:42 +0000 (10:44 +0530)
committermtr <mtr@mtr>
Wed, 24 Nov 2010 05:14:42 +0000 (10:44 +0530)
commit481ba14524e9a26b0d46401d8bd6834aa49728f5
tree82628728356e9fe76d617a855d0dbc7b14fa1477
parent6269b4aabed7e43f03b64f97c0656e0617bf01c6
parent1db216ccc8455e317a16fec44ca30c139c4eca2b
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20101124051442-x64ymf3pyb9fcy39