[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Tue, 1 Feb 2011 12:46:51 +0000 (18:16 +0530)
committermtr <mtr@mtr>
Tue, 1 Feb 2011 12:46:51 +0000 (18:16 +0530)
commitd4214987f8982cfde952e431eb716fef98a23e55
tree153085e99002fa2665f59fb113007561fa2d7159
parentc336a9979a6b9900b654318690ce6faff1ddd3ee
parent19cf9e10540e2a7cc93a119d65e57015d96c03e9
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20110201124651-lrhtpwo9jpgo7zd2