# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1308564172 -7200
# Node ID 1f47c6ec53d61a034fca38b21bfe4b4491e47ca3
# Parent  2bb39e4601868d94b18fdc78df566ab817072331# Parent  8d821e2fed38a06d0e904f020e10d6a152006cc6
Merge with stable