pidgin: c1a33238: merge of 'b6e009fb9284f653ac58c5309b5443...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: c1a33238c9242ec1d3bc51e941adada7ad60ff54
Ancestor: b6e009fb9284f653ac58c5309b5443eec6f12c8e
Ancestor: dbb1a72f8c673c57a1b03e941c52cc371c73641e
Author: nosnilmot at pidgin.im
Date: 2009-07-04T01:16:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c1a33238c9242ec1d3bc51e941adada7ad60ff54

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

ChangeLog: 

merge of 'b6e009fb9284f653ac58c5309b5443eec6f12c8e'
     and 'dbb1a72f8c673c57a1b03e941c52cc371c73641e'