pidgin: 24a56806: merge of '62e0eb23e1c2cd6ac1d8a7d96b6e59...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 24a56806ef9dfa8ea67d214a92a19c9011bc8a27
Ancestor: 62e0eb23e1c2cd6ac1d8a7d96b6e598bd54ed0d2
Ancestor: c8e0fdc8a85e96e382b7f826cfebfb1f54dcf12b
Author: rekkanoryo at pidgin.im
Date: 2008-10-30T03:58:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/24a56806ef9dfa8ea67d214a92a19c9011bc8a27

Modified files:
        libpurple/blist.c libpurple/blist.h
        libpurple/plugins/log_reader.c pidgin/Makefile.am
        pidgin/gtkprefs.c

ChangeLog: 

merge of '62e0eb23e1c2cd6ac1d8a7d96b6e598bd54ed0d2'
     and 'c8e0fdc8a85e96e382b7f826cfebfb1f54dcf12b'