# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1303692141 -3600
# Node ID f3ab526d876103fddded8cf70286671fe53133c2
# Parent  2357dbe7fabf868919fd9637fdba15adf97a42e0# Parent  b8ae2e290420666e946b20d0280c3f2912fc2645
Merge with stable