# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1297762829 -3600
# Node ID cd432ceb6544d0abbc462e90d7026b2deabc0538
# Parent  0738a9d72c57fa131834610d83cf5448f7d1e287# Parent  0b9f0c42b5660a8c5aa59e6e3f62fa4ca4fcff25
Merge with stable