# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1308559339 -7200
# Node ID c67c41af264ccee43cbae2b830ebb1f9c4007253
# Parent  6ab8b17adc03c423b53fb50951058915edc4ca60# Parent  f9c056f48018611504f8e08e83cefcb42c8a2641
merge with stable