# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1172251233 0
# Node ID dc01798f4c9699b11918939019dc4461f99e547d
# Parent  d79c9952f6bbf1bd809379ed5ed6f815e533cb54# Parent  70e4796455ba41b8ca06ae4f0e25a600fff8adda
merge of '7c02d9741848a5265c0dce9fcd9f222c4bdb13b9'
     and 'f732243ea0c32832b8289f06bfb5f63566966a06'