# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1279523628 -3600
# Node ID 5ac8451a1bc4478e5623af9c585b389ff448809f
# Parent  25fcb8ed70c40a07d29254e6c1f536e40e45f17e# Parent  09e39675a7020345e60c7bcf9905a7d8fdb4ecd7
(stable) merge