# HG changeset patch
# User lana
# Date 1381559466 25200
# Node ID 0678607f30e5e8bf503bc15ca39c221ff509a95d
# Parent  f3bec12a63e777143336b19f33d94d20ab2e8624# Parent  6e60d0f8cbc6921621d2e4e743604463599111f4
Merge