merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Thu, 15 Jun 2006 16:23:57 +0000 (10:23 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Thu, 15 Jun 2006 16:23:57 +0000 (10:23 -0600)

Trivial merge