# HG changeset patch
# User veltr
# Date 1327312069 -3600
# Node ID 70795f940a6c5ed88d373461692119b50a6e0d32
# Parent  2c0bd0671707f80352ee4079903a6a85b3b99548
Merge with b7ac9cfefda44dd1827b9071dad62edf67aa1d62