merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Sun, 4 Feb 2007 19:24:53 +0000 (12:24 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Sun, 4 Feb 2007 19:24:53 +0000 (12:24 -0700)

Trivial merge