[Merge] lp:~nathwill/ubuntu/precise/pam/lp-110287 into lp:~ubuntu-core-dev/pam/ubuntu

[Nathan Williams]

Yeah, we have a bug squashing party this weekend, and I'm planning to fix this up then
-- 
https://code.launchpad.net/~nathwill/ubuntu/precise/pam/lp-110287/+merge/100282
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~nathwill/ubuntu/precise/pam/lp-110287 into lp:~ubuntu-core-dev/pam/ubuntu.