# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1281916829 -3600
# Node ID 8a23ff764a02364369cbac26fcdf69371a7c69ab
# Parent  4c37b26c549c47c0aadc378e57d0db8f3e20630f# Parent  09bae16e7a6d51235dc7a448fd786c1c3d0f7c47
(stable) merge