# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1285254203 -7200
# Node ID b86b51448177b664536d4a8f5e395b1ab532eb5d
# Parent  630d72ae4f76566f0344d27180085ebaf14aa199# Parent  b7fbc49d5c7598011ee496e9986591ca3638ab22
Merge with default