# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1299505274 -3600
# Node ID 57f7a3817083d2c62e6f16e7752794b37a497e92
# Parent  460ab7a133ac030aa9dc4c59ec6317b538f9b967# Parent  fe775751eb93efededb91b66d58dd2cd78543f71
Merge with stable