[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

xrg/openerp-server,ovnicraft/openerp-server,MarkusTeufelberger/openobject-server,xrg/openerp-server,splbio/openobject-server,gisce/openobject-server,gisce/openobject-server,vnc-biz/openerp-server,splbio/openobject-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,vnc-biz/openerp-server,ovnicraft/openerp-server