# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1220359728 14400
# Node ID b741dc506a4c578bfc75caa69be055da7720de76
# Parent  b395cf3c0d0a64bf45d5e895209bb0b1a9ad4913# Parent  6a75bd9be8ef674b959920e7f2183c1ea3d0ec27
Merge with stable