Merge remote-tracking branch 'sstabellini/xen-2013-01-14' into staging