[MERGE] branch merged with lp:openobject-addons
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 7 Oct 2011 07:22:12 +0000 (12:52 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 7 Oct 2011 07:22:12 +0000 (12:52 +0530)
bzr revid: mtr@tinyerp.com-20111007072212-r7z3d7y0g4m9jstm


Trivial merge