merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Thu, 18 Jan 2007 04:31:22 +0000 (21:31 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Thu, 18 Jan 2007 04:31:22 +0000 (21:31 -0700)

Trivial merge