[FIX] originally correct to-be-merged code broken during merge
[FIX] originally correct to-be-merged code broken during merge
splbio/openerp-web,gisce/openerp-web,splbio/openerp-web,vnc-biz/openerp-web,MarkusTeufelberger/openerp-web,vnc-biz/openerp-web,MarkusTeufelberger/openerp-web,gisce/openerp-web,splbio/openerp-web,vnc-biz/openerp-web,MarkusTeufelberger/openerp-web,gisce/openerp-web,vnc-biz/openerp-web