# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1287611169 -3600
# Node ID 42c5129e9c6611b2ff3368deb4d43728115bf0b9
# Parent  12f6e285e4e7f33b358d1ed2555ab3a454025308# Parent  e5e1c16fe5b7c211276fee63bf2d09ec17d59154
Merge with stable