# HG changeset patch
# User Jan Kanis <jan.code@jankanis.nl>
# Date 1403190029 -7200
# Node ID 40ce2043006a884dcbb1c9ba2fd27c4374204dc6
# Parent  6ecbfebb9dd93d4a524581f36e8b9f92d31c0a21# Parent  f1791df1478ccc6765bf063e51f345f7a41ec714
merge py2.6 branch