# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1242704922 -7200
# Node ID 3fbd03b215e658d0453e3e2459f10fafe556d93f
# Parent  492234da500baa7b77efabd8f279e957c3e8c544# Parent  c937a2e35411eb1b492418278e747b844be2afbf
Merge with stable