# HG changeset patch
# User ivand
# Date 1311689189 -3600
# Node ID 18700ceb895f6c95d6bbe262e2cfb95aa748d903
# Parent  b8db4285e0cabdac4938d1c6e69eca6c18573411# Parent  5a5e54f733c909a0448272d6a974e4a878a07812
merge from default branch