# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1189466022 0
# Node ID bfa1557a77739d25da8ac29ce747c913a81312b5
# Parent  e5b8270375346a15001f2e2737a3e275f20e30c8# Parent  1e1bed59a86fd14ecfcef85087f633cc22232db0
merge of '6cda5928fecda502e1e06e10736c5d98b4406298'
     and 'd7cb01344555e79e52e3d02630d6fe26dba2e5bf'