# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1270983733 -7200
# Node ID 7c4c13361550f9a196d84ce614f8aba3b6af8c9d
# Parent  6c1feeed33141b2dc5bb7c816f986fe2b72526f6# Parent  6a711ebb385da25b404c4444e1b5f8b540f33119
merge from 1.9.2 branch