# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1243274725 -7200
# Node ID b7b183546a1572b6b6c0304300aaa6e1c66302ec
# Parent  3fbd03b215e658d0453e3e2459f10fafe556d93f# Parent  e44b46c85b72289fa043d8d0861d833221ae7aa0
Merge with stable