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

Trivial merge