Added by Anthony Liguori over 14 years ago
Merge commit 'linux-user/linux-user-for-upstream' into staging