# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1339342342 -3600
# Node ID 25db33023e4ed05e15e0740cbe15cff3aa34c224
# Parent  06fb629c6195b8e4cbe81d3bee1f5c1673b2c8ae# Parent  15dc93f78ecd6c3f535ada48f4ca0d8f840c4163
Merge with stable