[MERGE] Merge lp:openobject-addons.
authorbth-openerp <bth@tinyerp.com>
Fri, 26 Apr 2013 05:01:33 +0000 (10:31 +0530)
committerbth-openerp <bth@tinyerp.com>
Fri, 26 Apr 2013 05:01:33 +0000 (10:31 +0530)
bzr revid: bth@tinyerp.com-20130426050133-2v5dycqfzxc1drrd


Trivial merge