# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1249484241 -7200
# Node ID 103120cace9304de9986f7f89f857eb4ff963212
# Parent  1357d4a4ad3e632fe7642832ea1e5c370b48f779# Parent  d0c35f5fa25faba7410d09a59165cbee1fb8386d
(stable) merge