# HG changeset patch
# User James Bergstra <bergstrj@iro.umontreal.ca>
# Date 1273465622 14400
# Node ID 3463c1761a942242d0c11735a903a312c832a53a
# Parent  841dd63c76e05b42f5a61b38a17280b4f4b54b1c
merge