# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1281916901 -3600
# Node ID 77154fe0e3a50d0fe3b9155ce780212d91055465
# Parent  09bae16e7a6d51235dc7a448fd786c1c3d0f7c47# Parent  7e69e2b40d9b4a566c95bbb4924b927f654a545c
Merge with stable