# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1350078379 -7200
# Node ID 2a75107bd979bfd06434ecfca86be208dc04307a
# Parent  cdabdd17f980e0290f93682d843759fa3ccc5db0# Parent  4e2090ed2e72840e72de781fc47bef9ab7b7d53a
Merge with default