# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1255984634 -7200
# Node ID 2b60823c450689ff442fadc984322aa370227a1f
# Parent  c01143cef2c78b3a25724d3cbba8fe08d8e6d716# Parent  e188e35ff4adee458919cf5a6a58a0f6f34afe85
(stable) merge