merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 13 Aug 2008 13:22:21 +0000 (22:22 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 13 Aug 2008 13:22:21 +0000 (22:22 +0900)

Trivial merge