Merge with xen-ia64-unstable.hg.
authorkfraser@dhcp93.uk.xensource.com <kfraser@dhcp93.uk.xensource.com>
Fri, 16 Jun 2006 17:08:27 +0000 (18:08 +0100)
committerkfraser@dhcp93.uk.xensource.com <kfraser@dhcp93.uk.xensource.com>
Fri, 16 Jun 2006 17:08:27 +0000 (18:08 +0100)

Trivial merge