# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1348012763 -3600
# Node ID 183d7e3d7ce8b6fe52783fbd5c87a5631c924218
# Parent  13a3f6161af826af1dba3f7cab296fdf01c62eb5# Parent  82f74372516eb235a78c9c7cd361879c938567dd
Merge with stable