merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Mon, 11 Aug 2008 02:04:52 +0000 (11:04 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Mon, 11 Aug 2008 02:04:52 +0000 (11:04 +0900)

Trivial merge