pidgin: 74190d6f: merge of '8d455562b69f961763bbfc46995442...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 74190d6fbb138e095f84e71b0e0513240531437c
Ancestor: 8d455562b69f961763bbfc469954425260f22917
Ancestor: 8f0b34c54e38066959f87d35b0af2ca6ae0e853b
Author: sadrul at pidgin.im
Date: 2008-04-26T12:12:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/74190d6fbb138e095f84e71b0e0513240531437c

Modified files:
        pidgin/gtkconv.c pidgin/gtkmain.c

ChangeLog: 

merge of '8d455562b69f961763bbfc469954425260f22917'
     and '8f0b34c54e38066959f87d35b0af2ca6ae0e853b'