# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305372409 -7200
# Node ID c5c61ae378de992469b25203a4de5a14834133e8
# Parent  80fc9699c7eb9e0a783c7c29a2875742116792d6# Parent  4bd06014631e7aaa86fdf24caaade1f4495054c7
Merge with stable