[MERGE] Merge lp:openobject-addons.
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Tue, 12 Feb 2013 05:50:52 +0000 (11:20 +0530)
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Tue, 12 Feb 2013 05:50:52 +0000 (11:20 +0530)
bzr revid: bth@tinyerp.com-20130212055052-hcsmdx08tn8caslm


Trivial merge