# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1244395403 -7200
# Node ID 060df226baffc30c38b02ea5d6aa0650e6bdeeb9
# Parent  1ce04b8decf2a2b25e2b8ff5a1cb24fc492f8af7# Parent  fd52c78e1aa77b116ed82ea5963609d05cf65bbb
Merge with stable