# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2012-06-17 22:33:19
# Node ID 930db0673614c85c6ea2cfba73fddb9db8746b3b
# Parent  1fd11b9d2dbad3b6646068a47e85c08909216885
# Parent  015a42e970a69c7439c32f7f165cb5b66553a0a8

merge