# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1286669413 -3600
# Node ID d3f66c4952ae5e1cdecba061b96356926a111903
# Parent  1f1db3dc9ddf3c9c147a72044cd5a420c6e69123# Parent  5a6898736b1a7b909f84dbb6faa8f8e4e389c652
Merge with stable