# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1308076521 -7200
# Node ID 2bb39e4601868d94b18fdc78df566ab817072331
# Parent  d64b0798075554032dc9b429f6cf5a9dd31db3ac# Parent  e6f112b6f14b0c74477c0398efe476be361cc3e5
Merge with stable