# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1318775524 -3600
# Node ID ab082912af32141fb0e3fc4b1bca2ff51069239f
# Parent  320bd57f76a3b29711995dd8aa82bbf0e7e19333# Parent  52af2791a71ee818d5b22b1a0a33dfa7d8af8486
Merge with stable