merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 20 May 2008 02:33:15 +0000 (11:33 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 20 May 2008 02:33:15 +0000 (11:33 +0900)

Trivial merge