# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1301224535 -7200
# Node ID 3ed02605e0f26285b4797cffeb6ab251fa34aafe
# Parent  24924dfb8326959a8251efe87d13666ca4dd5f38# Parent  1a9cd0b534a034677077301ab7250ade6401766a
Merge with stable