# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1321876331 0
# Node ID a08af90d2bcce359d4ae4142d0f631a0dc982f14
# Parent  c1ee4cc36089dc7cbaee6030b00a90e3e6efb1fc# Parent  f8c2547c8f169eb06c45e38dbaae94b0f929d3f5
Merge with stable