# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1236232061 -3600
# Node ID 8117a011d1bda28d4a88513bb3416148e98ab238
# Parent  3fef0be9f5504e0d5422716520f27c550b47917c# Parent  062ce3b9c962771879cd8301c43d59bf81fb0965
Merge with stable