# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1288951283 0
# Node ID eca16536349a09ed70cbb95ca1c0e10cfcf26056
# Parent  fb1e8925292de52fee34af5cd89e1c82cad711d1# Parent  3450d7f7d1a321d1965dff45aa5f65face5aeb40
Merge with default