# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1309524734 -7200
# Node ID 0d4e44410b4dcf0466848b28fc6ffe64d6d7933d
# Parent  1f47c6ec53d61a034fca38b21bfe4b4491e47ca3# Parent  87b7569d740486da7d4fd3636d49e9ace5082799
Merge with stable