# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1268333318 -3600
# Node ID 876f5dff4e59b8f60265578954cd88ddadc570b9
# Parent  8428f3bda904a6844548bcf976df56a138529a8a# Parent  2305f9255f0435ff6a7cc861c6249b7b7401ce80
(stable) merge