[MERGE] Merge with lp:openerp-web
authorHiral Patel (OpenERP) <hip@tinyerp.com>
Fri, 9 Nov 2012 13:17:19 +0000 (18:47 +0530)
committerHiral Patel (OpenERP) <hip@tinyerp.com>
Fri, 9 Nov 2012 13:17:19 +0000 (18:47 +0530)
bzr revid: hip@tinyerp.com-20121109131719-9a8neqj633brvjru


Trivial merge