merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Thu, 22 May 2008 10:42:51 +0000 (19:42 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Thu, 22 May 2008 10:42:51 +0000 (19:42 +0900)

Trivial merge