# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1280140473 -7200
# Node ID 997913902cf2206df43781b0c51cd60161b37e38
# Parent  5ac8451a1bc4478e5623af9c585b389ff448809f# Parent  9f939fae8ff3365d86359fdcda60f2e4be746b2c
(stable) merge