# HG changeset patch
# User Heiko Schlittermann <hs@schlittermann.de>
# Date 1264020148 -3600
# Node ID de0a255128449f02c12fdb3c1ae736f2a6dde486
# Parent  d4942418a9ea19ae0f398c2d57149f6c83b96dac# Parent  39421a9700c5e9d0f51652ec4c344a75f8ae725d
merged from stable