pidgin: e6bf9292: merge of '183db7b36f0f27730e6f1b86c30b7a...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: e6bf929294c7abc06409f35f1f0fe8c58e0231e4
Ancestor: 183db7b36f0f27730e6f1b86c30b7ab9dfb22ab7
Ancestor: 28b86ce49cc2f235b2107932b91f6a290b924efe
Author: sadrul at pidgin.im
Date: 2009-07-01T08:18:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e6bf929294c7abc06409f35f1f0fe8c58e0231e4

Modified files:
        pidgin/gtkblist.c pidgin/gtknotify.c

ChangeLog: 

merge of '183db7b36f0f27730e6f1b86c30b7ab9dfb22ab7'
     and '28b86ce49cc2f235b2107932b91f6a290b924efe'