Merge proposals dependent on lp:~dylanmccall/ubuntu/oneiric/network-manager-applet/lp852961-disable-autostart-for-gnome-shell

1. Oneiric (11.10)
2. lp852961-disable-autostart-for-gnome-shell
3. Dependent merge proposals