# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1307797438 -7200
# Node ID d64b0798075554032dc9b429f6cf5a9dd31db3ac
# Parent  b95f15ba1b1b5057fa40b9a0a9ee749627615096# Parent  aaafe06aaa5f3d1fe75746c8813853d1a3ed0f34
Merge with stable