merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Wed, 7 Feb 2007 17:46:18 +0000 (10:46 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Wed, 7 Feb 2007 17:46:18 +0000 (10:46 -0700)

Trivial merge