# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1194201912 0
# Node ID 8aee77a1b94d6b4a4c268dff54df3a839c03219e
# Parent  93e674197822aed735eb41dfd82d3b3c5017b833# Parent  cb747d0f34576c98db2b0802b4e53049ad57c17d
merge of '3196ba6eba49b037cf62d9785fbc866b199321f3'
     and 'eee80ca106e368e47ea5c275a0a83dc8b24d0c54'