[MERGE] Merge with lp:openobject-addons
authorSbh (OpenERP) <sbh@tinyerp.com>
Wed, 19 Jan 2011 05:10:49 +0000 (10:40 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Wed, 19 Jan 2011 05:10:49 +0000 (10:40 +0530)
bzr revid: sbh@tinyerp.com-20110119051049-wkdffl0su0fqtvdh


Trivial merge