Import patch 3e56de90e3eb8777f8d6c7db57664959407eab49 from xen-api-libs
Import patch 3e56de90e3eb8777f8d6c7db57664959407eab49 from xen-api-libs

Originally-by: Vincent Bernardoff <8e5719c1570e7a2e4cdddc970cf6a6ad782911a1@ocamlpro.com>

thomassa/xen-api-libs-transitional,djs55/xen-api-libs-transitional