# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1276120230 -3600
# Node ID 1b077329846ec628ecf206e2abbf91d75a23be35
# Parent  81d8da31c542ff956405ca056e571d10a4bc498f# Parent  c5badbf855dbfcaaa26b069915f390da81ab04e4
(stable) merge