pidgin: e1e17208: merge of '0866182af6b0894f55f42ac5dd8d01...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: e1e1720893fdd056f2d3a0c1b059c6338a57110a
Ancestor: 0866182af6b0894f55f42ac5dd8d01f9a2c3160c
Ancestor: 921a6693312cc38dd6dbc93e91d6bf5c60938634
Author: qulogic at pidgin.im
Date: 2009-07-07T06:31:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e1e1720893fdd056f2d3a0c1b059c6338a57110a

Modified files:
        ChangeLog libpurple/Makefile.am libpurple/ft.c
        libpurple/protocols/msn/msn.c pidgin/gtkutils.c

ChangeLog: 

merge of '0866182af6b0894f55f42ac5dd8d01f9a2c3160c'
     and '921a6693312cc38dd6dbc93e91d6bf5c60938634'