[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Tue, 6 Sep 2011 05:06:18 +0000 (10:36 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Tue, 6 Sep 2011 05:06:18 +0000 (10:36 +0530)
bzr revid: dbr@tinyerp.com-20110906050618-nmzuy802krxzsm8f


Trivial merge