# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1274214179 -7200
# Node ID 53df72b60f067e7d6048dc10d6683a192f6242fa
# Parent  491c3fc0f551fd71ecb851639defd4d47bd91423# Parent  6c99007688cec5f3f819d5fc3cfa4e373ec13304
Merge with stable