# HG changeset patch
# User Peter Hjalmarsson <xake@rymdraket.net>
# Date 1242676464 0
# Node ID e22e1f45065de5ce7e4f194d083621707f7300c2
# Parent  47d963966c9aea942d80a5c221296826e7f5fb09# Parent  6bc0e4e76207a043e77dc16e10843992deec82a4
merge of '6a6409370fa50e23bc8fdedcef230220fa680a36'
     and 'dd33cca1c5e6f5f7ea4cb392ed2954841617c1f1'