tree 142ccb7c60f9eba302a5c35715158121e885fded
parent 94c5495dd16ca3311cbc95705e58d28a45899d1d
parent 666bcd913b1f3e4be8f92995c217498e05379493
author Anthony Liguori <aliguori@us.ibm.com> 1247170167 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1247170167 -0500

Merge commit 'linux-user/linux-user-for-upstream' into tmp-staging