Merge proposals dependent on lp://qastaging/~soren/ubuntu/maverick/libvirt/ubuntu-uml-nwfilter

1. Maverick (10.10)
2. ubuntu-uml-nwfilter
3. Dependent merge proposals