merge with xen-unstable.hg (staging)
authorAlex Williamson <alex.williamson@hp.com>
Mon, 22 Oct 2007 19:57:08 +0000 (13:57 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Mon, 22 Oct 2007 19:57:08 +0000 (13:57 -0600)

Trivial merge