# HG changeset patch
# User Sandro Knauß <knauss@netzguerilla.net>
# Date 1348759086 -7200
# Node ID 887ca66823bba073a0024fa644bd5043ab238231
# Parent  d5ebbcccc41be4614fd581ce11fa45e7cd79ce2a# Parent  3b3410b70e8599c2c28f6c2fd01843b8db75beef
merging from default