[MERGE] Merged with server/trunk.
[MERGE] Merged with server/trunk.
ovnicraft/openerp-server,gisce/openobject-server,gisce/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,ovnicraft/openerp-server,gisce/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server