merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 23 Jul 2008 03:10:20 +0000 (12:10 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 23 Jul 2008 03:10:20 +0000 (12:10 +0900)

Trivial merge