merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 16 Sep 2008 12:25:30 +0000 (21:25 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 16 Sep 2008 12:25:30 +0000 (21:25 +0900)

Trivial merge