# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1202546520 -3600
# Node ID d18a329bf222a19d293547df9e34f6991424e58f
# Parent  ed160b097badb0b97aa87cb7ad30ffd94f113499# Parent  c27209bf8385c84a3f79ee730a9bb7f4ebaf1d82
(stable) merge with default branch