[MERGE]
[MERGE]

--HG--
extra : convert_revision : nicolas.vanhoren%40openerp.com-20110513154746-ebfzrkq16101pasa

MarkusTeufelberger/openerp-web,gisce/openerp-web,gisce/openerp-web,splbio/openerp-web,vnc-biz/openerp-web,vnc-biz/openerp-web,splbio/openerp-web,MarkusTeufelberger/openerp-web,gisce/openerp-web,vnc-biz/openerp-web,MarkusTeufelberger/openerp-web,vnc-biz/openerp-web,splbio/openerp-web