[MERGE] Sync with lp:openobject-addons/7.0
authorParamjit Singh Sahota <psa@tinyerp.com>
Thu, 22 Aug 2013 05:10:59 +0000 (10:40 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Thu, 22 Aug 2013 05:10:59 +0000 (10:40 +0530)
bzr revid: psa@tinyerp.com-20130822051059-eq0r7kpvi7uxrje4


Trivial merge