merge lp:~openerp-dev/openobject-server/trunk-sloppy-rng-jam-base-tch
merge lp:~openerp-dev/openobject-server/trunk-sloppy-rng-jam-base-tch

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