# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1286635639 -3600
# Node ID 1f1db3dc9ddf3c9c147a72044cd5a420c6e69123
# Parent  908e4fe6c1771f4842d84aad6292aa30323767a3# Parent  1069be3ee9dbe57897587e1fd493905fb3271454
Merge with stable