# HG changeset patch
# User Peter Hjalmarsson <xake@rymdraket.net>
# Date 1237239862 0
# Node ID 15911f71e37fdf828794de06f8d18df3f6e01028
# Parent  3d997c09b94ec6ad9c8e38616b3f8978c5ef5bdd# Parent  983311560ef9953c11521492a673a92af18555ce
merge of '73e463add9a124c86554c2958526e1a6ee5fc22f'
     and '9d2e2c1cd6d653a56af68a602532212502bd9317'