pidgin: adf75e16: merge of '2df22d7ed44f0ccc912fc22ea2e038...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: adf75e16803f48adaeb629054074f52e928b0792
Ancestor: 2df22d7ed44f0ccc912fc22ea2e0389c0e445b6f
Ancestor: c5ef0491bd5e808f50c7826bf06e52d8ec3f1d7c
Author: nosnilmot at pidgin.im
Date: 2008-03-09T19:17:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/adf75e16803f48adaeb629054074f52e928b0792

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

ChangeLog: 

merge of '2df22d7ed44f0ccc912fc22ea2e0389c0e445b6f'
     and 'c5ef0491bd5e808f50c7826bf06e52d8ec3f1d7c'