# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1283275108 -3600
# Node ID a9331f9561dd15d211f22562526b36b38e9dc0f9
# Parent  77154fe0e3a50d0fe3b9155ce780212d91055465# Parent  5a41673d33fb3dbe1be82fc20689b40f5722e1c2
Merge with stable