# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1304242677 -3600
# Node ID 08aeedc73cb7ad3bb83f3177aa8ee869d6faf3be
# Parent  702ca6f80844aadc80a3df2fc04fff5974d3517f# Parent  8212da2b01eb6021e9bd7640f1dbc2597141862b
Merge with stable