Merge remote-tracking branch 'sstabellini/xen-20130625' into staging