pidgin: 1bbd08b1: merge of '7743dd71673c71e91039e890a3a939...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 1bbd08b1b4f931fa4318c1042033c441a36397ee
Ancestor: 7743dd71673c71e91039e890a3a939f9850f2d16
Ancestor: aed601f22fca91705bab1c3dd963575547419e64
Author: qulogic at pidgin.im
Date: 2009-07-04T04:28:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1bbd08b1b4f931fa4318c1042033c441a36397ee

Modified files:
        libpurple/protocols/oscar/oscar.c libpurple/util.c
        pidgin/gtkprefs.c

ChangeLog: 

merge of '7743dd71673c71e91039e890a3a939f9850f2d16'
     and 'aed601f22fca91705bab1c3dd963575547419e64'