pidgin: 4f7ebd10: merge of '48260c71a42cee1dd4e220b7c67218...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 4f7ebd10f9b2db16fa68b60e528f766e6c9dd450
Ancestor: 48260c71a42cee1dd4e220b7c672187cfe99cc2f
Ancestor: c45d4f4446ba8de761e53590b8f0b67cb7e4acf0
Author: rekkanoryo at pidgin.im
Date: 2009-03-04T06:29:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4f7ebd10f9b2db16fa68b60e528f766e6c9dd450

Added files:
        libpurple/plugins/one_time_password.c
Modified files:
        libpurple/plugins/Makefile.am pidgin/gtkblist.c

ChangeLog: 

merge of '48260c71a42cee1dd4e220b7c672187cfe99cc2f'
     and 'c45d4f4446ba8de761e53590b8f0b67cb7e4acf0'