merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 12 Sep 2008 05:47:40 +0000 (14:47 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 12 Sep 2008 05:47:40 +0000 (14:47 +0900)

Trivial merge