# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1286958079 -3600
# Node ID a6865ff86aaf248e7ec3483197276ffa641f0ab1
# Parent  c793c1a87f1cc203e4b8c4f790043a38400b7211# Parent  df93d61a7790e535f47b4d9c53862a1ad13bae16
Merge with stable