Merge proposals dependent on lp://qastaging/~ubuntu-core-dev/network-manager/ubuntu.0.6.x.hardy

1. ubuntu.0.6.x.hardy
2. Dependent merge proposals