pidgin/pidgin

merge of '0f5cf0aaeb07300ee4f118bca066df8a6736a789'
release-2.2.1
2007-10-01, Luke Schierer
466855db01f9
merge of '0f5cf0aaeb07300ee4f118bca066df8a6736a789'
and '536822f0bc014a13db391400482c7d16d8a15796'
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im