From: Sbh (OpenERP) <sbh@tinyerp.com>
Date: Tue, 7 Dec 2010 10:34:29 +0000 (+0530)
Subject: [Merge] Merge bug fix lp:683047,lp:684527
X-Git-Tag: 6.0.0-server~17^2~119
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=19eacd6e81f6f1eef7516dd327d99b0f658e6d45;p=odoo%2Fodoo.git

[Merge] Merge bug fix lp:683047,lp:684527

bzr revid: sbh@tinyerp.com-20101207103429-6eix18iy00kh4462
---

19eacd6e81f6f1eef7516dd327d99b0f658e6d45