[MERGE] branch merged with lp:openobject-addons
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 26 Sep 2011 05:52:14 +0000 (11:22 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 26 Sep 2011 05:52:14 +0000 (11:22 +0530)
bzr revid: mtr@tinyerp.com-20110926055214-shfrkhp7zs7c1sws


Trivial merge