[MERGE]: Merge with latest trunk-server
[MERGE]: Merge with latest trunk-server
gisce/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,ovnicraft/openerp-server,splbio/openobject-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,ovnicraft/openerp-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,gisce/openobject-server