[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 15 Jun 2012 09:28:32 +0000 (14:58 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 15 Jun 2012 09:28:32 +0000 (14:58 +0530)
bzr revid: tpa@tinyerp.com-20120615092832-h8lbgqatler3grki


Trivial merge