# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1251472708 -3600
# Node ID 473c764ba2b7bf43a0b7393750e9a173678d1994
# Parent  d0c35f5fa25faba7410d09a59165cbee1fb8386d# Parent  bf971e786e93960f19abccac99f34fe4705e2c79
Merge with stable