From: apa-tiny <apa@tinyerp.com>
Date: Mon, 15 Nov 2010 10:46:45 +0000 (+0530)
Subject: merged from trunk
X-Git-Tag: 6.0.0-rc2-addons~79^2~8^2~18
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=11c31dd6e25305becba14bdd595a019715c80fb3;p=odoo%2Fodoo.git

merged from trunk

bzr revid: apa@tinyerp.com-20101115104645-vul9ovrm3zf53eh1
---

11c31dd6e25305becba14bdd595a019715c80fb3