Merge remote-tracking branch 'sstabellini/xen-2012-10-03' into staging