merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 10 Oct 2008 03:06:46 +0000 (12:06 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 10 Oct 2008 03:06:46 +0000 (12:06 +0900)

Trivial merge