merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Sun, 28 Jan 2007 23:47:12 +0000 (16:47 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Sun, 28 Jan 2007 23:47:12 +0000 (16:47 -0700)

Trivial merge