[MERGE] Trunk.
authorVaibhav (OpenERP) <vda@tinyerp.com>
Tue, 4 Oct 2011 05:28:52 +0000 (10:58 +0530)
committerVaibhav (OpenERP) <vda@tinyerp.com>
Tue, 4 Oct 2011 05:28:52 +0000 (10:58 +0530)
bzr revid: vda@tinyerp.com-20111004052852-zjj7us1v411emfbp


Trivial merge