# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1299790868 -3600
# Node ID 64ae7e3ecd643b087739613d167f7a51dbb4edbf
# Parent  fe775751eb93efededb91b66d58dd2cd78543f71# Parent  a8ae86023c67e6093aba91def957d04159aa5f2e
stable: merge with default