# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1333745604 -7200
# Node ID a3385251155855a6256caea5a44511b6cfff68c4
# Parent  3c257fefa53d4fb1e883a6fb1fff0f99b4203278# Parent  0e3b1a8a243cd8b24cdd5020e08e05f1637a7986
Merge with stable