[MERGE] with trunk.
authorNimesh Contractor (OpenERP) <nco@tinyerp.com>
Wed, 5 Jun 2013 07:02:19 +0000 (12:32 +0530)
committerNimesh Contractor (OpenERP) <nco@tinyerp.com>
Wed, 5 Jun 2013 07:02:19 +0000 (12:32 +0530)
bzr revid: nco@tinyerp.com-20130605070219-zs4wo3gxoa5mm5qx


Trivial merge