[MERGE] trunk fix
[MERGE] trunk fix
MarkusTeufelberger/openerp-web,gisce/openerp-web,gisce/openerp-web,MarkusTeufelberger/openerp-web,splbio/openerp-web,gisce/openerp-web,MarkusTeufelberger/openerp-web,splbio/openerp-web,splbio/openerp-web