# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1314019833 -7200
# Node ID 1e6274cca0356c2b77be0fe5c43a4988a6859f7d
# Parent  dc0a82841a60ea77aa87fa9bb54654d707105013# Parent  5bb58c956e480bb2faabce05684cfe4b0ccf6733
merge with "backend" branch