# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1313993235 0
# Node ID 0179f6642e9c09f6b6ade5ba7a594acdb177cdda
# Parent  757fc30ca2ab4ab41e8d51a1b5945dd3b24cc885# Parent  ce37181749de5a714fbc00816607ab3497e8ff26
merge of '6f0f65518dbd9cdbb6b41be078c9cd9db3bbea4b'
     and 'eed8d6d92e6894745a401dae52be4f5c91ebfc11'