[Merge] Merge from openerp-web.
authorJiten (OpenERP) <jra@tinyerp.com>
Fri, 14 Oct 2011 05:19:52 +0000 (10:49 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Fri, 14 Oct 2011 05:19:52 +0000 (10:49 +0530)
bzr revid: jra@tinyerp.com-20111014051952-a5emayrxco8oztyy


Trivial merge