[MERGE]Merge lp:openobject-addons.
authorbth-openerp <bth@tinyerp.com>
Wed, 12 Jun 2013 06:42:41 +0000 (12:12 +0530)
committerbth-openerp <bth@tinyerp.com>
Wed, 12 Jun 2013 06:42:41 +0000 (12:12 +0530)
bzr revid: bth@tinyerp.com-20130612064241-dfc0nlmljimerk0b


Trivial merge