Merge with xen-ia64-unstable.hg.
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Thu, 8 Feb 2007 17:27:30 +0000 (17:27 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Thu, 8 Feb 2007 17:27:30 +0000 (17:27 +0000)

Trivial merge