# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1237379830 -3600
# Node ID c5f89f0be6ef49a01c9271c4f955aa4283dd6a8c
# Parent  8117a011d1bda28d4a88513bb3416148e98ab238# Parent  6028e8046c14166904c2e30c0d9c3056560d7d52
Merge with stable