# HG changeset patch
# User Pascal Volk <user@localhost.localdomain.org>
# Date 1340911610 0
# Node ID a4aead244f7542a33cac86ce79199608d89d532b
# Parent  c0e1fb1b0145e2cc50e76b12ef99950d024d5095# Parent  28230a8230bffbd41e7462337be677cd6a236dfc
Merged changes from v0.6.x(28230a8230bf).