From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 31 Mar 2010 14:49:35 +0000 (+0200)
Subject: merge
X-Git-Tag: 6.0.0-rc1-server~1268
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=0df4600ac1379eaf37c2d7066e7c4f38947616bd;hp=-c;p=odoo%2Fodoo.git

merge

bzr revid: fp@tinyerp.com-20100331144935-qqzvrmolejwcv6hl
---

0df4600ac1379eaf37c2d7066e7c4f38947616bd