# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1249293193 -7200
# Node ID 1357d4a4ad3e632fe7642832ea1e5c370b48f779
# Parent  cd72d08ba8778c25afa104797db499f2580bad16# Parent  ec683ca3ba289425912d2e52f80c763800c6bd45
(stable) merge