pidgin: 8d0bb283: merge of '04b459a0054fec05e338c8cb5cdafb...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 8d0bb2830b866b018ff771a36b7bddfa4aef8f7a
Ancestor: 04b459a0054fec05e338c8cb5cdafb9d3feb12b5
Ancestor: 4dfc05ac6d6ae070920c029799fb08b7e3b08973
Author: darkrain42 at pidgin.im
Date: 2010-06-15T01:33:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8d0bb2830b866b018ff771a36b7bddfa4aef8f7a

Modified files:
        libpurple/protocols/gg/lib/resolver.c
        libpurple/tests/test_util.c libpurple/util.c

ChangeLog: 

merge of '04b459a0054fec05e338c8cb5cdafb9d3feb12b5'
     and '4dfc05ac6d6ae070920c029799fb08b7e3b08973'