# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1299504867 -3600
# Node ID 460ab7a133ac030aa9dc4c59ec6317b538f9b967
# Parent  cd432ceb6544d0abbc462e90d7026b2deabc0538# Parent  c3681742c0c7beadc9d9f81bada6026d8bef4fc5
Merge with stable