From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 3 Aug 2010 04:30:11 +0000 (+0530)
Subject: [MERGE] merge with main branch
X-Git-Tag: 6.0.0-rc1-addons~578^2~1^2~22
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=a5935b536694789565f8c4aed213327a0de754d3;p=odoo%2Fodoo.git

[MERGE] merge with main branch

bzr revid: mra@mra-laptop-20100803043011-8j58befmrpm6uecj
---

a5935b536694789565f8c4aed213327a0de754d3