pidgin/pidgin

merge of '4d3a417f3d028dfc35faf34b678dbe93327a72d8'
release-2.2.1
2007-10-01, Luke Schierer
f50cd2ea8c28
merge of '4d3a417f3d028dfc35faf34b678dbe93327a72d8'
and 'afc03cb3158d100964055c5cceff8dc627d9641f'
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im