# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1299068688 -3600
# Node ID c39e9cead0ae2526024b44614bfee09ac4875f27
# Parent  643b8212813e631b5525049fc4321a34a4def105# Parent  da192c62f89edbcaa86f8af41cfb2c4879cd0dbe
merge with stable