# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1299790922 -3600
# Node ID 1fb7ab079d11694245048e9f21332f3c6cf23cd1
# Parent  a8ae86023c67e6093aba91def957d04159aa5f2e# Parent  8c5c3a0aa6d5b5e644ec123f0add992af465fce9
Merge with stable