# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1285531187 -7200
# Node ID 0ae62443e644e7f56106f0f61cf499593c537234
# Parent  b86b51448177b664536d4a8f5e395b1ab532eb5d# Parent  028b6584decb35f4fe883a469392906c53786951
Merge with default