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