Merge proposals dependent on lp://qastaging/~network-manager/network-manager-applet/ubuntu.lucid

1. ubuntu.lucid
2. Dependent merge proposals