merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 25 Nov 2008 05:21:24 +0000 (14:21 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 25 Nov 2008 05:21:24 +0000 (14:21 +0900)

Trivial merge