pidgin/pidgin

9361e3d017e7
merge of 'aa0819fe56c1601728a6a3950c0211265995d12e'
and 'b444f69545577782e05cd6889037eae9e42ca5ca'
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im