# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1349861461 -7200
# Node ID 2d9daef1e473005960545bda37456171866643d3
# Parent  183d7e3d7ce8b6fe52783fbd5c87a5631c924218# Parent  294cea906d3ad5a718fa392b7c6be40ae31764d0
Merge with stable