[MERGE] branch merged with lp:openobject-addons
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 24 Oct 2011 09:46:20 +0000 (15:16 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 24 Oct 2011 09:46:20 +0000 (15:16 +0530)
bzr revid: mtr@tinyerp.com-20111024094620-7v8fr3ryttd5vuh7


Trivial merge