merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Thu, 4 Dec 2008 02:01:53 +0000 (11:01 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Thu, 4 Dec 2008 02:01:53 +0000 (11:01 +0900)

Trivial merge