# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1244395553 -7200
# Node ID c371aaf377e0659dc3291d943d02e009837adbca
# Parent  fd52c78e1aa77b116ed82ea5963609d05cf65bbb# Parent  cd5da00e93cdd51a4d372bd267e8ff7f50e6104f
(stable) merge