# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1302014141 -7200
# Node ID 91b4389198997ad5c991ca108d6b2226eda99cbf
# Parent  3ed02605e0f26285b4797cffeb6ab251fa34aafe# Parent  2ffafb688274379bdb8e073c8dbb1c97f1683017
Merge with stable