# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1245060615 -3600
# Node ID b9b551e18502c1d9d726d7df5003caefc2f29fef
# Parent  b21f76520d40fca24acd506563375622988abad9# Parent  0cdbdf79d5e9a30d90ced727a9cbfcb65ee4e5c9
Merge with stable