[Merge] lp:~micahg/ubuntu/natty/pidgin/2.7.9-2 into lp:ubuntu/pidgin

[Kees Cook]

The contents of the merge look okay to me. The changelog should be updated to include the whole delta between Debian and Ubuntu, but once that's done, I'd be happy to upload it.
-- 
https://code.launchpad.net/~micahg/ubuntu/natty/pidgin/2.7.9-2/+merge/48721
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~micahg/ubuntu/natty/pidgin/2.7.9-2 into lp:ubuntu/pidgin.