pidgin: 06a717cb: merge of '4a470af3f892b6e0337b0f9bb37a21...

Thu Apr 1 22:15:50 EDT 2010

-----------------------------------------------------------------
Revision: 06a717cbd5d5cae94a3019a5a3a18bbd08b01e5f
Ancestor: 4a470af3f892b6e0337b0f9bb37a216c7370e8fa
Ancestor: 782e804fc8a8d63fd48996df3e691de231e1facc
Author: sadrul at pidgin.im
Date: 2010-04-02T02:17:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/06a717cbd5d5cae94a3019a5a3a18bbd08b01e5f

Modified files:
        finch/libgnt/gntbox.c libpurple/protocols/jabber/presence.c

ChangeLog: 

merge of '4a470af3f892b6e0337b0f9bb37a216c7370e8fa'
     and '782e804fc8a8d63fd48996df3e691de231e1facc'