# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1272633719 -7200
# Node ID abd249e1db3c1ff66cc5c57bc9d5a71fe97ec317
# Parent  0ff5881bc04b830180f1c1dffab241e5e412f4ad# Parent  dc8fe24c628e700bf214c49632df8b3dd6d02ca1
(stable) merge