pidgin/pidgin

merge of '392db9c2383dd6a8931565b8451179220d6cbbfc'
release-2.2.1
2007-10-01, Luke Schierer
97e945cef795
merge of '392db9c2383dd6a8931565b8451179220d6cbbfc'
and '88c21e50426d7f139ecfdf059ebd108cdaa2d069'
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im