Merge proposals dependent on lp://staging/~network-manager/network-manager/network-manager.karmic

1. network-manager.karmic
2. Dependent merge proposals