# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1259494053 0
# Node ID dead519e4ec647aca5ebd5098037834635c8da59
# Parent  25e813ce68e27033b53e000f855b419666e88da2# Parent  06ccaeb6cfc15849da11a0873200dc50a54bffeb
Merge with stable