[MERGE] Sync with lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Tue, 2 Jul 2013 05:07:54 +0000 (10:37 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Tue, 2 Jul 2013 05:07:54 +0000 (10:37 +0530)
bzr revid: psa@tinyerp.com-20130702050754-6w50y566l1ws9zq4


Trivial merge