# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1320776033 0
# Node ID 826681fc0976d957c28ebed98845fccc69900229
# Parent  b675519e2a5b3f15bfe98d1242ae14d3c6e3e00c# Parent  d86b26020b4816665e6a31d34e068ac155580413
Merge with stable