# HG changeset patch
# User EmFor
# Date 1313333852 -7200
# Node ID 88a56bd5c86bdfdee5cb7c8f71895dd40d1a0cf7
# Parent  8279a0152198e3de02b2da3a87f03e073765fa00# Parent  61d9b5ba7256bdc8fc699b02d8a8c4782df24ece
Merge 2nd try