merge of '134eb2e58f255d14d53d8b9463921ce7edb9aa36'v2.0.0
commit86d554e6adb2587cae29809ff49f3dea2ce1a89a
authorDaniel Atallah <datallah@pidgin.im>
Fri, 4 May 2007 05:34:31 +0000 (4 05:34 +0000)
committerDaniel Atallah <datallah@pidgin.im>
Fri, 4 May 2007 05:34:31 +0000 (4 05:34 +0000)
tree48af80202a299d5f504e1ddcd2071cc526821ef7
parentd0fb824fd77bb2f2ac49e0774feced5cb6bca3cd
parent00bed7c84b90ec81e5aceaac023444ffca07b8f6
Merge ... '134eb2e58f255d14d53d8b9463921ce7edb9aa36'
     and '1db915a02e333205b392938376d3675752994bb0'

--HG--
extra : convert_revision : 8c0ef1cb63204eeb0e5cda5501300c62d11bf89e