Merge proposals dependent on lp://staging/~cyphermox/network-manager/pptp-ubuntu.head.dailybuild_maverick

1. pptp-ubuntu.head.dailybuild_maverick
2. Dependent merge proposals