sync with the xen trunk