# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1284749636 -7200
# Node ID 12eadf33cce1c80c45ecb7e89153ae4f15fa3d8f
# Parent  b14093780eaf649f267e3c4ea4e4ed14f87160a5# Parent  9cc90e2c826f1be4a27cfcb7268dc5a7ef0aa322
Merge with stable