merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 5 Dec 2008 06:47:19 +0000 (15:47 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 5 Dec 2008 06:47:19 +0000 (15:47 +0900)

Trivial merge