Merge branch 'stable/xen-pciback-0.6.3' into stable/drivers