# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1245924030 -7200
# Node ID 3b4d5045a920e2bf3820c65516e03bc2981d9ce2
# Parent  38c937c7289dc00c99409a3ea136c16e8f3e0e1c# Parent  527257649f2050ee7d49c4a837561c4a89c1a346
(stable) merge