merge of '082cb6577e6dede908826bc73a512645071673fe'v2_0_0beta7
commit8e4343fca4645abc7be5ed700cce258e15b14750
authorSean Egan <seanegan@pidgin.im>
Mon, 30 Apr 2007 05:06:29 +0000 (30 05:06 +0000)
committerSean Egan <seanegan@pidgin.im>
Mon, 30 Apr 2007 05:06:29 +0000 (30 05:06 +0000)
treef4025b187e97f79633ff098646606eb1765371dd
parent2dc0a31ef24a6da8af8e933375fa6ccb81aec0d7
parent3073965c2856a437c6534f877ec2ee823e014eba
Merge ... '082cb6577e6dede908826bc73a512645071673fe'
     and 'bf9779a51471f98c95339f8736da02b6af1a0a89'

--HG--
extra : convert_revision : 92e787fa231318dd21ddc9dd68f17b636033b13e