# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1320673923 0
# Node ID b675519e2a5b3f15bfe98d1242ae14d3c6e3e00c
# Parent  5c25b505ffc1a0a7a0f663f4b2bf0807a22fd8cd# Parent  59bd7f0171032674bb10629feb325c64de7de1f6
Merge with stable