# HG changeset patch
# User Joseph Turian <turian@iro.umontreal.ca>
# Date 1215143739 14400
# Node ID 54384b1eb2b93a42dd745c44f286f1d4e4a24680
# Parent  3d5a483fe73247c8d79ce96ce7368a4fb938dc95# Parent  a04ce1e6ea540067176e99206818e340eda01d4c
merge