# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1274442436 -7200
# Node ID 4708409c896c964c06f5ead9c69b0ab1eafd76d7
# Parent  7c4c13361550f9a196d84ce614f8aba3b6af8c9d# Parent  053863c0cba80e6289e5d0e77ebccb4cacf25c3d
merge from 1.9.2 branch