# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1276679323 -7200
# Node ID 25fcb8ed70c40a07d29254e6c1f536e40e45f17e
# Parent  0492a5acf652ba3a7d0199d11f78a54e45b61bcc# Parent  3bf3212b13bc3572a53e636d7b3838f32f162f53
(stable) merge