# HG changeset patch
# User koda
# Date 1354582334 -3600
# Node ID 555a6e06cb3309f8a84fbdd5b1e766780257504c
# Parent  780e156f19ea013a60e7cd2bd03c6d6d4867713b# Parent  f781204831ab4331c9ab8aaf010b66f1ef9cadea
second merge