# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1247268351 -7200
# Node ID d20f53be425619981545dee80ad9eb414d8e4373
# Parent  671543b933458cba778486b0047d29c5ebede90d# Parent  f9e8e4992b7ead654c777895d607f8a7c8b78ac5
Merge with stable