# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1244536441 -7200
# Node ID 098d7464c8e43fe657f0c2e9a76c8a739b93709a
# Parent  cd5da00e93cdd51a4d372bd267e8ff7f50e6104f# Parent  4895a3df2098f324027ecf171f689cc9a9d758e9
Merge with stable