# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1202948542 -3600
# Node ID e15e7ec5b3c3de00eadf89fb8b9c4a447c0ffe2e
# Parent  05d0c3e4efdc6ba0c84ae32b4b79d15e5c34a0c7# Parent  45d3ea301c03d9cd7bef873581ef0514d327fea4
Merge with stable