# HG changeset patch
# User igor@chub.in
# Date 1215183274 -10800
# Node ID 3638f4587c78c3f25e7a72563c1ccb5af3cce93c
# Parent  ab7c06df9db9ceddbe4002c186ffc277ff620231# Parent  ff93ad94d73bc473453459758558088953c947a6
merge