Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'agraf/xen-next' into staging