im.pidgin.pidgin: 2c4268ead97dc703bd2c043897a0e92d0f9267aa

Mon Oct 29 02:50:41 EDT 2007

-----------------------------------------------------------------
Revision: 2c4268ead97dc703bd2c043897a0e92d0f9267aa
Ancestor: 5e40b4c4c0c2949025f174c4aef2da0c54d79c31
Ancestor: 886ce0e2c644e00427871777bb58888fbb8035cd
Author: khc at pidgin.im
Date: 2007-10-29T06:45:53
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/yahoo/yahoo_packet.c pidgin/gtkprefs.c

ChangeLog: 

merge of '5e40b4c4c0c2949025f174c4aef2da0c54d79c31'
     and '886ce0e2c644e00427871777bb58888fbb8035cd'