# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1228482599 -3600
# Node ID 0107b6de1a3558db9bd7a8f92e60b23e986a4847
# Parent  16b690351c0d4f2bbccfbf70d0f12901ff52267d# Parent  9ea5ac3258b6c5549fa53dc94295dde0af192762
Merge with stable