Merge branch 'xen-netfront-next'