pidgin: 7e7c75b2: merge of '177e6ef54aafc14b79387d7bbfc3fb...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 7e7c75b2610c9df44a0015ba1b295198236ad768
Parent:   177e6ef54aafc14b79387d7bbfc3fbefce5983a2
Parent:   ad8af0814c6d7e7e74562e202c097aadcfcd0ef5
Author:   markdoliner at pidgin.im
Date:     08/10/10 02:58:03
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7e7c75b2610c9df44a0015ba1b295198236ad768

Changelog: 

merge of '177e6ef54aafc14b79387d7bbfc3fbefce5983a2'
     and 'ad8af0814c6d7e7e74562e202c097aadcfcd0ef5'

Changes against parent 177e6ef54aafc14b79387d7bbfc3fbefce5983a2

  patched  NEWS

Changes against parent ad8af0814c6d7e7e74562e202c097aadcfcd0ef5

  patched  libpurple/network.c