Merge with ia64/xen-unstable.hg
authorKeir Fraser <keir@xensource.com>
Fri, 2 Nov 2007 09:16:57 +0000 (09:16 +0000)
committerKeir Fraser <keir@xensource.com>
Fri, 2 Nov 2007 09:16:57 +0000 (09:16 +0000)

Trivial merge