# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1336916387 -3600
# Node ID 6c7d0e38c0c2edf962ff86837c322c1ac4351cab
# Parent  bd418e7e2d294301acaccde7ff23c48afca73766# Parent  bc8e57c1ae32d914a118775974dd7445bd960eab
Merge with stable