merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 26 Nov 2008 01:23:49 +0000 (10:23 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 26 Nov 2008 01:23:49 +0000 (10:23 +0900)

Trivial merge