# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1312792720 -3600
# Node ID 600f20908ede75db66fec2d08875f285abd746c4
# Parent  9c15f5c37707b54c6782db53e078a4582d4bc011# Parent  a50ed14997fc1e9d2d285e8f74b125ac65fcd741
Merge with stable