merge of 'b178d389afe03fa3ff8e7561fb9793064e85a75b'
commit59a56f6061e68ce81268a1435183318cb54bf7c5
authorDaniel Atallah <datallah@pidgin.im>
Fri, 19 Dec 2008 04:12:30 +0000 (19 04:12 +0000)
committerDaniel Atallah <datallah@pidgin.im>
Fri, 19 Dec 2008 04:12:30 +0000 (19 04:12 +0000)
tree1f4b7ae1244922662b7defb13619758c14f37709
parentf090266d4c50df0d06696e6221ede472f0e142b2
parenteed7707adaaaf3dc984d3bec596f08b7bf63d990
Merge ... 'b178d389afe03fa3ff8e7561fb9793064e85a75b'
     and '886b7731776464b2dfc9b2f9163c7684b0d012b7'

--HG--
extra : convert_revision : 02f96b2eda6e5da2c9428b2ea02f38556a112530