# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1202854193 -3600
# Node ID 9a93b5d66e65acfb507425ee09b7b4f91e8113f7
# Parent  45a318c5ea20de931bb7190a4fa1418d70d7004e# Parent  05d0c3e4efdc6ba0c84ae32b4b79d15e5c34a0c7
(stable) merge with default branch