merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Fri, 30 Nov 2007 15:54:33 +0000 (08:54 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Fri, 30 Nov 2007 15:54:33 +0000 (08:54 -0700)

Trivial merge