# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1204852894 -3600
# Node ID 7d1aeda2d0ccd59251e55d65694269881ccc3988
# Parent  b69dca43ef085adc31c9972e028df4294cdce81b# Parent  439a24d34a1393f0ce95ecbcdcb8a6ae5c1ec0ee
Merge with stable