# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1358369762 0
# Node ID e475cc6eff08f2f3f5a79fa3b9f95a6a9176f20b
# Parent  5eb5ba3b9e99170ae48feb06f6a5681c4bd79e3f# Parent  6f2f7246e4bebab09a06b00f1f4b951c47325b0f
Merge with stable