# HG changeset patch
# User Alexander Medvedev <devl547@gmail.com>
# Date 1274298212 0
# Node ID a734a39e19eef98b49990b7b0d0a08c5ec6c98d3
# Parent  57c6f2ac5869593a960d9734c7bf186b1b417383# Parent  b442795bbc26fd01cfc8ceaf99705d9a9d5765e2
merge