[MERGE] https://code.launchpad.net/~openerp-dev/openobject-server/trunk-dev-framework up to rev2125
[MERGE] https://code.launchpad.net/~openerp-dev/openobject-server/trunk-dev-framework up to rev2125


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