Merge proposals dependent on lp://staging/~network-manager/network-manager-applet/ubuntu.0.7.1.jaunty

1. ubuntu.0.7.1.jaunty
2. Dependent merge proposals