# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1203103136 -3600
# Node ID 3d882f14f23aece0f37eae54af624cabedb40092
# Parent  45d3ea301c03d9cd7bef873581ef0514d327fea4# Parent  b69dca43ef085adc31c9972e028df4294cdce81b
Merge stable with default