From: mtr <mtr@mtr>
Date: Tue, 7 Dec 2010 04:18:23 +0000 (+0530)
Subject: [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
X-Git-Tag: 6.0.0-rc2-addons~127^2~64^2~28^2~1
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=3a10434a1e1fb059a4d08f67da07dfac405d3e0a;p=odoo%2Fodoo.git

[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20101207041823-4v40c0jcq73ndztv
---

3a10434a1e1fb059a4d08f67da07dfac405d3e0a