From: Raphaël Valyi <rvalyi@gmail.com>
Date: Sat, 10 Jul 2010 17:51:57 +0000 (-0300)
Subject: [merge]
X-Git-Tag: 6.0.0-rc1-addons~579^2~29^2~21
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b4c2404a5bff8748d13094207ae185ab3e44cf29;p=odoo%2Fodoo.git

[merge]

bzr revid: rvalyi@gmail.com-20100710175157-6fesw4ykbsyo2odn
---

b4c2404a5bff8748d13094207ae185ab3e44cf29