# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1202591851 -3600
# Node ID 49bc08b63eb37042af07ca7786edd6b9e5a6c726
# Parent  c27209bf8385c84a3f79ee730a9bb7f4ebaf1d82# Parent  45a318c5ea20de931bb7190a4fa1418d70d7004e
Merge with stable