# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1286621552 -3600
# Node ID 67c17a447d997ded0b94f613c79064b6238437db
# Parent  0ae62443e644e7f56106f0f61cf499593c537234# Parent  8f2c2cc51789ddb3b5f8f5eac176552fb6e5f343
Merge with default