pidgin: e09226ff: merge of '70479082260072a56b0aea40ccca31...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: e09226ff43686401f45368b4047b907c205abfba
Ancestor: 70479082260072a56b0aea40ccca311822c17155
Ancestor: bc7e620f5c66149f20e492d6d02c549e1fab6709
Author: darkrain42 at pidgin.im
Date: 2009-05-22T00:13:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e09226ff43686401f45368b4047b907c205abfba

Modified files:
        libpurple/nat-pmp.c libpurple/protocols/msn/slplink.c
        pidgin/Makefile.am

ChangeLog: 

merge of '70479082260072a56b0aea40ccca311822c17155'
     and 'bc7e620f5c66149f20e492d6d02c549e1fab6709'