[Libvir] Merging remote patch

I'm merging the remote patch into libvirt CVS. Things may break, although I'm hoping to keep any brokenness to a minimum. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903