# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1247222424 -7200
# Node ID 671543b933458cba778486b0047d29c5ebede90d
# Parent  c50f56b5f4b865c21f0b397869b4a4e79b8692cb# Parent  6bbf554beea25577679ef04dda0a4d16af833253
Merge with stable