# HG changeset patch
# User lana
# Date 1366218357 25200
# Node ID 2600c8d8b619935c6332e1d0725508f3d61ff9cd
# Parent  b95c5c8ee60a7eadc8eb85408faffea1761c2685# Parent  4c13b7994f38153542295c8794821118777c222a
Merge