merge of 'e947e60e03ec3789fda7a90a5d407f3f783fc4cb'
commit3d097b678521adaa4cfd7bf3798fd57bc08224f1
authorSadrul Habib Chowdhury <sadrul@pidgin.im>
Fri, 4 May 2007 05:35:03 +0000 (4 05:35 +0000)
committerSadrul Habib Chowdhury <sadrul@pidgin.im>
Fri, 4 May 2007 05:35:03 +0000 (4 05:35 +0000)
tree3f7159d1345b54889dfbafd451ea143356cde0e3
parent079f71416f29c3fe42e490907d316e30d4fa1897
parent8b120119d4b6ad9350007e89dd44ea5b1742ce0e
Merge ... 'e947e60e03ec3789fda7a90a5d407f3f783fc4cb'
     and '25ce48c3805f3e039ce2ffb5f60308f5ee69066c'

--HG--
extra : convert_revision : 7ab1a9f040f485407725bec50dbe60b8845f5dbf