# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1318029875 -3600
# Node ID 0f5e2d5e716babcd9b3f6666644f0db5ee7dd5bf
# Parent  639bb4617c704de72f61591be8563361c79634a7# Parent  d60568a6946505b2454c47f413f0a59293169d0b
Merge with stable