# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1190740965 0
# Node ID d9dbf9163aca5d5ed74cd0ae4ea26dc128551bbc
# Parent  ecfc73719334d689660e4ee08e7281424c7daf57# Parent  c1b559a2610f29af119e32f807e71e9a7af35755
merge of 'b2924d43f1e1cb2d01705932d9a06df6eedf7ac0'
     and 'f806298d83f1f4756b944463190afa08f5da9df6'