# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1326934248 -3600
# Node ID 15aa105f81e282899666853ad3f9f1ea8437d2a6
# Parent  1321f8629e893f3c59b747cd4be0248009153d85# Parent  7c2190b236cfa90ebf6b43ad8d03d8b12bcfdbb6
Merge with stable