# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1337300514 -3600
# Node ID 834f71467ecc47bc50eb2881e02446dd4a67b772
# Parent  9c31017cb4b2ef3866d15f1516af01bac50987c5# Parent  2a1ab2f6559cd954a881474d41cbedb6b318d4ba
Merge with stable