[MERGE] trunk.
authorVaibhav (OpenERP) <vda@tinyerp.com>
Wed, 23 Nov 2011 10:29:17 +0000 (15:59 +0530)
committerVaibhav (OpenERP) <vda@tinyerp.com>
Wed, 23 Nov 2011 10:29:17 +0000 (15:59 +0530)
bzr revid: vda@tinyerp.com-20111123102917-w5tbmo4fox75t6mz


Trivial merge