merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Mon, 1 Sep 2008 07:59:43 +0000 (16:59 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Mon, 1 Sep 2008 07:59:43 +0000 (16:59 +0900)

Trivial merge