[MERGE]: Merge with lp:~openerp-dev/openobject-server/trunk-rework-server-23-mar-aag
[MERGE]: Merge with lp:~openerp-dev/openobject-server/trunk-rework-server-23-mar-aag
splbio/openobject-server,ovnicraft/openerp-server,gisce/openobject-server,gisce/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server,ovnicraft/openerp-server,MarkusTeufelberger/openobject-server,vnc-biz/openerp-server,gisce/openobject-server,vnc-biz/openerp-server,splbio/openobject-server