Merge with ia64 tree.
authorKeir Fraser <keir.fraser@citrix.com>
Wed, 26 Nov 2008 11:14:26 +0000 (11:14 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Wed, 26 Nov 2008 11:14:26 +0000 (11:14 +0000)

Trivial merge