# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1248375623 -3600
# Node ID f27b8d46e708169ad6903c66ae2e24df16dd7df9
# Parent  f9e8e4992b7ead654c777895d607f8a7c8b78ac5# Parent  6e73db2016ab3c391225ca9f4fb1deb44a5c3063
(stable) merge