[Merge] lp:~mfisch/ubuntu/oneiric/gnome-nettool/multiple-ui-fixes into lp:ubuntu/oneiric/gnome-nettool

[Matt Fischer]

Note: For some reason the .pc file was checked-in to bzr (before I pulled the branch) which makes my diff look huge.  Any thoughts on how to fix this?
-- 
https://code.launchpad.net/~mfisch/ubuntu/oneiric/gnome-nettool/multiple-ui-fixes/+merge/83414
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~mfisch/ubuntu/oneiric/gnome-nettool/multiple-ui-fixes into lp:ubuntu/oneiric/gnome-nettool.