# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1304160080 -3600
# Node ID 702ca6f80844aadc80a3df2fc04fff5974d3517f
# Parent  3881911c17b0276fece9c752e30976d9a8bac483# Parent  abb2a67ce631edf96b77e48c35a2d45d0e233f73
Merge with stable