# HG changeset patch
# User meillo@marmaro.de
# Date 1225121011 -3600
# Node ID 24872a9fe6e1490bf0841b2a0a6ddeb8b55003d7
# Parent  26e34ae9a3e32c70555501e255982d1267aee918# Parent  c9bce6bb2a5d7a0a0ea06bda3518f1106fcc1f92
merged