merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 24 Dec 2008 03:52:34 +0000 (12:52 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 24 Dec 2008 03:52:34 +0000 (12:52 +0900)

Trivial merge