pidgin: b6e009fb: merge of '3fe037ee4d003527c8f4f41974e016...

Fri Jul 3 21:10:21 EDT 2009

-----------------------------------------------------------------
Revision: b6e009fb9284f653ac58c5309b5443eec6f12c8e
Ancestor: 3fe037ee4d003527c8f4f41974e01680d5eea27e
Ancestor: c75c4072b910c269873d22b25bb5639d85bb1b9b
Author: markdoliner at pidgin.im
Date: 2009-07-04T01:07:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b6e009fb9284f653ac58c5309b5443eec6f12c8e

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

ChangeLog: 

merge of '3fe037ee4d003527c8f4f41974e01680d5eea27e'
     and 'c75c4072b910c269873d22b25bb5639d85bb1b9b'