# HG changeset patch
# User veltr
# Date 1326982439 -3600
# Node ID 2c0bd0671707f80352ee4079903a6a85b3b99548
# Parent  067002a5131d67d8b4605cf5c7dd58321a848350
Merge with 00f37b85b2e245676e96d9148315c4a3de6d7539