[MERGE] with trunk.
authorNimesh Contractor (OpenERP) <nco@tinyerp.com>
Mon, 22 Jul 2013 05:38:51 +0000 (11:08 +0530)
committerNimesh Contractor (OpenERP) <nco@tinyerp.com>
Mon, 22 Jul 2013 05:38:51 +0000 (11:08 +0530)
bzr revid: nco@tinyerp.com-20130722053851-ba9k7spxtyzkmnsw


Trivial merge