# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1340368823 -3600
# Node ID 1e477be3b6c8e5a004fb06263efa991240d316c7
# Parent  df702ad9b3148ad2d370027035f632f07e9045e2# Parent  3007e5d9eb4e0e2aa2e25739175cfc81dfef17fc
Merge with stable