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