# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1247015347 -7200
# Node ID 6bad7f6bb4a58f4211dc0074d4d68dcad71edf5b
# Parent  75621fa839fbfd1467468ff9cf85db07a38269ea# Parent  7f928c9d56d0d0d8a5318ee9a8c800ce4d625aa2
Merge with stable