# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1390870222 -3600
# Node ID 7f5a761329953e088f06fa19dc61a68f228d88cf
# Parent  962bbb34eebb258f7253cbf959426f6634d9cf49# Parent  cb4614a10b27b5d3dabad99ad2a8dd4b13ca2f94
Merged with default, even though its changes were accidentally added here first.