# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1272748722 -7200
# Node ID 62bfb4b0c1ea463ec3740bf29718bbad9e5d4205
# Parent  e5bfe51eeea9b9603eab3871617add68ba3ae246# Parent  f2e3829bfbf0afb89852ff4009ef442a5e350b38
(stable) merge