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

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