From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 22 Oct 2010 04:51:28 +0000 (+0530)
Subject: [MERGE] merge from trunk addons
X-Git-Tag: 6.0.0-rc2-addons~127^2~325
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=011b05bf12f0a5716a97abe67a86c265aba07c8a;p=odoo%2Fodoo.git

[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101021131113-0b4qnurympyrtyet
bzr revid: mra@mra-laptop-20101022045128-vcrcs3pvlhdi971p
---

011b05bf12f0a5716a97abe67a86c265aba07c8a