# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1249290542 -7200
# Node ID ce4452c11c2fd69dfa6a36ece33032b751f711e2
# Parent  1d512632995b6d4c5c35860115fb465d30a09e17# Parent  cd72d08ba8778c25afa104797db499f2580bad16
Merge with stable