# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1190547493 0
# Node ID 31f4199a4cd436ad9fdb745954b1b399a1ff242e
# Parent  964014aee978009014a1721d56153434c06e644c# Parent  c905f5824422b53d0b70390399e448551d7ada62
merge of '0323f7621f6891ce008d0a124fef6ed63c856802'
     and '6ce1cc1ed82e1940fd7b17f4ca3c8350885117fa'