From: Yogesh (OpenERP) Date: Wed, 12 Oct 2011 05:09:18 +0000 (+0530) Subject: [MERGE] Merge with trunk upto revision no 1218. X-Git-Tag: 6.1.0-rc1-addons~1543^2~14 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=c6d4bea1c2e9198f07eab560677c2dd52408cf2a;p=odoo%2Fodoo.git [MERGE] Merge with trunk upto revision no 1218. bzr revid: ysa@tinyerp.com-20111012050918-c83f2y42ocshk6e6 --- c6d4bea1c2e9198f07eab560677c2dd52408cf2a