pidgin: 93ece3b2: merge of '74190d6fbb138e095f84e71b0e0513...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 93ece3b23f9fcb890d44df77c831b035ecec0837
Ancestor: 74190d6fbb138e095f84e71b0e0513240531437c
Ancestor: aeea2d3844bffa0e26ef1d7545c2986d55d3a170
Author: evands at pidgin.im
Date: 2008-04-26T13:36:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/93ece3b23f9fcb890d44df77c831b035ecec0837

Modified files:
        pidgin/gtkmain.c

ChangeLog: 

merge of '74190d6fbb138e095f84e71b0e0513240531437c'
     and 'aeea2d3844bffa0e26ef1d7545c2986d55d3a170'