Merge remote-tracking branch 'sstabellini/xen-fixes-20120801' into staging