# HG changeset patch
# User Peter Hjalmarsson <xake@rymdraket.net>
# Date 1247671648 0
# Node ID 5e83f9fe4d0927f1ddbfcbe66079c3cc5cb1dd99
# Parent  828d21a1ec43957b949d14d70e9054a4f20e133d# Parent  e22e1f45065de5ce7e4f194d083621707f7300c2
merge of '04fc08604e52c75e1a6fbe762bd0bf5646fb7707'
     and 'd9ebf57fb51742d0991c758dfe470c353fe3924f'