# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1247182381 -7200
# Node ID 0d75562ef3b0eca6da41446068000e1a4ef92dec
# Parent  7f928c9d56d0d0d8a5318ee9a8c800ce4d625aa2# Parent  c50f56b5f4b865c21f0b397869b4a4e79b8692cb
(stable) merge