# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1350832225 -3600
# Node ID 2498fa07212f0f49df2f12c59b52ebfcb121a7b3
# Parent  95e6504e6e2768fcd8047553767adea163448e26# Parent  d98134ae80ba288def09864ca4d26d343a8f66a3
Merge with stable