Added by Anthony Liguori almost 13 years ago
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging