merge of 'f00ec654e74afed9c624d400350760bdf2d17b19'
commit2dc0a31ef24a6da8af8e933375fa6ccb81aec0d7
authorSean Egan <seanegan@pidgin.im>
Mon, 30 Apr 2007 04:43:52 +0000 (30 04:43 +0000)
committerSean Egan <seanegan@pidgin.im>
Mon, 30 Apr 2007 04:43:52 +0000 (30 04:43 +0000)
tree3a716f2264617f78dbe0528d7a1fa0240bbca6e0
parenteddd417dbcd0f857e17b1da4f1eb67393de0e300
parent4f6fda83d163b6709ecfb0ebfc29b7bc5707d8b8
Merge ... 'f00ec654e74afed9c624d400350760bdf2d17b19'
     and 'ec1ce1576e6f72178293971da7cea75c47040d73'

committer: Daniel Atallah <datallah@pidgin.im>

--HG--
extra : convert_revision : 1a714629d05ac070d2a906784c700521755eb827