# HG changeset patch
# User koda
# Date 1354402996 -3600
# Node ID d24257910f8dd300610d5ae297ca16b28a6b21b9
# Parent  0ad9c42dca7cfefebe1c6d4e88cb40d03dadc288# Parent  2816919ea74dfc1d33bf01010dcde439f7c83590
merge