# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1214955840 0
# Node ID c59f8dcd5a6582c3b18a07b13ceb6f266c81508c
# Parent  3ea41f885135c939bd832cab3e4c538ac8613316# Parent  60f97d40ddab830e0139913717c3c07a9284c259
merge of '7de4400bc908601979951f3463a2ba92f322b9ad'
     and 'bb3484634f9085aae573ddc5c90a9ad2d5c7635d'