pidgin: 54f9b89a: merge of '3993504a85f5cbebaeace03466d79c...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 54f9b89abccda90d90bcd15d12fd091279a7f54e
Ancestor: 3993504a85f5cbebaeace03466d79cda9803f240
Ancestor: b0e4f59562899debec9d9703c55843aec700aeac
Author: darkrain42 at pidgin.im
Date: 2009-05-02T21:13:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/54f9b89abccda90d90bcd15d12fd091279a7f54e

Modified files:
        libpurple/protocols/jabber/presence.c
        pidgin/gtksavedstatuses.c

ChangeLog: 

merge of '3993504a85f5cbebaeace03466d79cda9803f240'
     and 'b0e4f59562899debec9d9703c55843aec700aeac'