pidgin: 2d81cb2e: merge of 'b2b2efabbafab6588e02ceb1650941...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 2d81cb2ed62d87e61e4c97d14a0bb01a45730638
Ancestor: b2b2efabbafab6588e02ceb16509419dcb0c79e9
Ancestor: b426234bbef68ed60bc6f15fc35ea1690d5a8ed1
Author: sadrul at pidgin.im
Date: 2008-04-04T06:11:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2d81cb2ed62d87e61e4c97d14a0bb01a45730638

Modified files:
        autogen.sh libpurple/buddyicon.c libpurple/buddyicon.h
        libpurple/imgstore.c libpurple/imgstore.h libpurple/notify.c
        libpurple/notify.h libpurple/protocols/jabber/jabber.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c libpurple/status.c
        libpurple/util.h pidgin/gtkconv.c

ChangeLog: 

merge of 'b2b2efabbafab6588e02ceb16509419dcb0c79e9'
     and 'b426234bbef68ed60bc6f15fc35ea1690d5a8ed1'