# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1302461499 -7200
# Node ID 2357dbe7fabf868919fd9637fdba15adf97a42e0
# Parent  91b4389198997ad5c991ca108d6b2226eda99cbf# Parent  97ec5d6590399cb6fc83124cf9541e06f8549119
Merge with stable