# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1358588450 0
# Node ID 531804688bf5b421391e2d9c3605405d0d333a1b
# Parent  e475cc6eff08f2f3f5a79fa3b9f95a6a9176f20b# Parent  469ccfe7aa92d258897ffda7411ac574df007435
Merge with stable