# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1245846447 -7200
# Node ID ed69ef4bd191014068088ade3cf3cdb4f0e3712d
# Parent  58569d4d0aec7be02cf14043d3265a434fda9c19# Parent  38c937c7289dc00c99409a3ea136c16e8f3e0e1c
Merge with stable