[MERGE] openerp-web.
authorVaibhav (OpenERP) <vda@tinyerp.com>
Wed, 24 Aug 2011 04:52:52 +0000 (10:22 +0530)
committerVaibhav (OpenERP) <vda@tinyerp.com>
Wed, 24 Aug 2011 04:52:52 +0000 (10:22 +0530)
bzr revid: vda@tinyerp.com-20110824045252-uo4b669n6oj9mdol


Trivial merge