# HG changeset patch
# User David Bryant <bagnose@gmail.com>
# Date 1343887457 -34200
# Node ID 9e1a313d800322f1a52a4b8c7d7e8aa8111f9f5c
# Parent  bc5baa585b325f6d27c3efdb977153d0eb97f914# Parent  5920bb2ddd0fb74cddcff1286267471984ebaff4
Merge

diff -r bc5baa585b32 -r 9e1a313d8003 builder.d
diff -r bc5baa585b32 -r 9e1a313d8003 configure.d