merge of '5b8360c29b011dc10812b101bc5fa0f63b598d0b' v2.2.2
authorLuke Schierer <lschiere@pidgin.im>
Tue, 23 Oct 2007 19:30:47 +0000 (19:30 +0000)
committerLuke Schierer <lschiere@pidgin.im>
Tue, 23 Oct 2007 19:30:47 +0000 (19:30 +0000)
commitdf068631c65b7275babcd3fcacee705bef87203f
tree914770da8d5a1a34b197f9534930c20017a70136
parent78c2c6fbdfacf34436d77bb058770a9628724325
parent326ee5e2a68e15e1a510baa44a86ea4963e1da9b
Merge ... '5b8360c29b011dc10812b101bc5fa0f63b598d0b'
     and 'aea39e96c0f692853ec1fb3a9358e192e89979e5'