[MERGE] fix regression introduced at revno: 3466, revision-id: vmt@openerp.com-20110617072608-5tmwf2g2qb0pwrhk
[MERGE] fix regression
introduced at revno: 3466, revision-id: vmt@openerp.com-20110617072608-5tmwf2g2qb0pwrhk

akretion/openerp-server,akretion/openerp-server,akretion/openerp-server