From: Harry (OpenERP) Date: Tue, 13 Dec 2011 09:46:56 +0000 (+0530) Subject: [MERGE] merged with trunk-development-branch X-Git-Tag: 6.1.0-rc1-addons~702^2~2 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=9344760678c27df4de1ac714a726674dbb3e930e;p=odoo%2Fodoo.git [MERGE] merged with trunk-development-branch bzr revid: hmo@tinyerp.com-20111213094656-4l13bf8hgub5hdr0 --- 9344760678c27df4de1ac714a726674dbb3e930e