# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1246295448 -7200
# Node ID 4362f0ef265a972f287ee21030b7c38c96cecc5f
# Parent  23da65f04361b66a43ae59c8411c7c0cc0649364# Parent  795a95d7dc6193d72cfdf049beb108f17a1ecba1
(stable) merge