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