# HG changeset patch
# User Heiko Schlittermann <hs@schlittermann.de>
# Date 1256596190 -3600
# Node ID 96697a91fbd27c53fc6e29e956cf3e9691cf4ae2
# Parent  79ab63474be71cd104738b2f0985f637978ac3c9# Parent  3f1318ea6bcbcf86178acf3530194ef20cc1dd9f
merged

diff -r 79ab63474be7 -r 96697a91fbd2 py2b