Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen