merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 7 Jan 2009 03:20:18 +0000 (12:20 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 7 Jan 2009 03:20:18 +0000 (12:20 +0900)

Trivial merge