Merge with ia64
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 20 May 2008 08:55:50 +0000 (09:55 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 20 May 2008 08:55:50 +0000 (09:55 +0100)

Trivial merge