From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 20 May 2010 15:38:11 +0000 (+0530)
Subject: [MERGE]: merging from the same brcnah
X-Git-Tag: 6.0.0-rc1-addons~860
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=642bedd1678ec4a8cf8035e8a4392cda926a30f8;p=odoo%2Fodoo.git

[MERGE]: merging from the same brcnah

bzr revid: mga@tinyerp.com-20100520153811-3udnonft8rzvzg0d
---

642bedd1678ec4a8cf8035e8a4392cda926a30f8