# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1318524509 -3600
# Node ID 320bd57f76a3b29711995dd8aa82bbf0e7e19333
# Parent  0f5e2d5e716babcd9b3f6666644f0db5ee7dd5bf# Parent  5fc540826f9f7737fd22192b18249d7d9db0d231
Merge with stable