# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1333210472 -3600
# Node ID 671c1a0be907d2738185c892a7d772af578b89a5
# Parent  a0451f80f66550d553e6c67b36f7d25e7e17f755# Parent  ede95d3a1f2707c457cb297f63511028256577f4
Merge with stable