From: Divyesh Makwana (Open ERP) <mdi@tinyerp.com>
Date: Wed, 11 Jul 2012 05:01:05 +0000 (+0530)
Subject: [Merge] Merge with main addons.
X-Git-Tag: 7.0-server~2812^2~7
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=f397081dce10375a6d8692f554a8049bc5bf915d;p=odoo%2Fodoo.git

[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120711050105-u25nvaztam6jac6d
---

f397081dce10375a6d8692f554a8049bc5bf915d