# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1284146531 -7200
# Node ID d91c2fa1c24859cdf5d0f04f3fb351326ade0fb6
# Parent  1ae8e3a802982c3f5a5701b2c6455ef6b45d56d9# Parent  b14093780eaf649f267e3c4ea4e4ed14f87160a5
(stable) merge