[MERGE] lp:openobject-addons
authorJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 18 Jul 2012 08:35:51 +0000 (14:05 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 18 Jul 2012 08:35:51 +0000 (14:05 +0530)
bzr revid: jam@tinyerp.com-20120718083551-f6288gz1ibhqsgns


Trivial merge