# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1267999075 -3600
# Node ID 13b10c2621a5ae3b80b88e76c312812bead8e271
# Parent  13bb123ad8945a3653f67a3508f8c6c351edb0e3# Parent  8428f3bda904a6844548bcf976df56a138529a8a
Merge with stable