[MERGE] merged from lp:~openerp-dev/openobject-server/trunk-bugfixes-Ind
[MERGE] merged from lp:~openerp-dev/openobject-server/trunk-bugfixes-Ind
vnc-biz/openerp-server,vnc-biz/openerp-server,gisce/openobject-server,gisce/openobject-server,splbio/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server,gisce/openobject-server,ovnicraft/openerp-server,ovnicraft/openerp-server,MarkusTeufelberger/openobject-server,splbio/openobject-server