[Merge] lp:~sdeziel/ubuntu/precise/xl2tpd/fix-for-lp1244780 into lp:ubuntu/precise/xl2tpd

[Sebastien Bacher]

setting to "work in progress", change back to "needs review" once those issues are addressed, to get it back to the sponsoring queue
-- 
https://code.launchpad.net/~sdeziel/ubuntu/precise/xl2tpd/fix-for-lp1244780/+merge/194247
Your team Ubuntu branches is requested to review the proposed merge of lp:~sdeziel/ubuntu/precise/xl2tpd/fix-for-lp1244780 into lp:ubuntu/precise/xl2tpd.