merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 3 Oct 2008 02:49:07 +0000 (11:49 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 3 Oct 2008 02:49:07 +0000 (11:49 +0900)

Trivial merge