# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1238926532 -7200
# Node ID bde29dbc3fc2229716f7f901026ac4a0b728485a
# Parent  c5f89f0be6ef49a01c9271c4f955aa4283dd6a8c# Parent  59cb740ebf834617f9958b389107667f01180120
Merge with stable