# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305222346 -7200
# Node ID 80fc9699c7eb9e0a783c7c29a2875742116792d6
# Parent  d2ee1f7d81f8b2931d36400b72f8f3aded4411e9# Parent  9e55adfb3a21fd2a1ab4fd654c706fbfaca4dd77
Merge with stable