This is hopefully the final spin of these patches, It squashes in all
the changes from:
https://www.redhat.com/archives/libvir-list/2012-February/msg01103.html
as well as:
https://www.redhat.com/archives/libvir-list/2012-February/msg01173.html
Dirk, please test these out and let me know if they're okay to push.
Thanks!