# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1283525948 -3600
# Node ID f236a384d23e5571df8e4ad39e222255a9576faf
# Parent  a9331f9561dd15d211f22562526b36b38e9dc0f9# Parent  1ae8e3a802982c3f5a5701b2c6455ef6b45d56d9
Merge with stable