[MERGE] lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Fri, 23 Sep 2011 13:37:07 +0000 (19:07 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Fri, 23 Sep 2011 13:37:07 +0000 (19:07 +0530)
bzr revid: dbr@tinyerp.com-20110923133707-9nsgqq0d1f2qdlv5


Trivial merge