# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1245798136 14400
# Node ID b75cf9292c35e88c0826704ae5a6145424a8d8ef
# Parent  2e174ecf0ce1d75300ccfe75ed1abba289c7dde8# Parent  f0242d032ba3318b45fdc1ec02ee22cfbcb1b52f
Merge in the changes I forgot to pull.

diff -r 2e174ecf0ce1 -r b75cf9292c35 .hgrc