[MERGE] with trunk,
authorNimesh Contractor (OpenERP) <nco@tinyerp.com>
Mon, 22 Jul 2013 05:44:25 +0000 (11:14 +0530)
committerNimesh Contractor (OpenERP) <nco@tinyerp.com>
Mon, 22 Jul 2013 05:44:25 +0000 (11:14 +0530)
bzr revid: nco@tinyerp.com-20130722054425-idq5mgulodzlrxpx


Trivial merge