# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1304123143 -3600
# Node ID 3881911c17b0276fece9c752e30976d9a8bac483
# Parent  6f25a5834e14fa94034cd75ee8046265279621b4# Parent  1666a4a682621f54fc30469598191c2d8ed2186e
Merge with stable