pidgin: 3905237b: merge of '6f0f65518dbd9cdbb6b41be078c9cd...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 3905237bd016f3e4407ac030adf4142677c3e202
Parent:   6f0f65518dbd9cdbb6b41be078c9cd9db3bbea4b
Parent:   eed8d6d92e6894745a401dae52be4f5c91ebfc11
Author:   markdoliner at pidgin.im
Date:     08/22/11 02:07:15
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3905237bd016f3e4407ac030adf4142677c3e202

Changelog: 

merge of '6f0f65518dbd9cdbb6b41be078c9cd9db3bbea4b'
     and 'eed8d6d92e6894745a401dae52be4f5c91ebfc11'

Changes against parent 6f0f65518dbd9cdbb6b41be078c9cd9db3bbea4b

no changes

Changes against parent eed8d6d92e6894745a401dae52be4f5c91ebfc11

no changes