[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Fri, 16 Sep 2011 04:52:27 +0000 (10:22 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Fri, 16 Sep 2011 04:52:27 +0000 (10:22 +0530)
bzr revid: dbr@tinyerp.com-20110915050724-kh73clbazpsq70dh
bzr revid: dbr@tinyerp.com-20110916045227-l5lte2twthfwbi7c


Trivial merge