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

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