# HG changeset patch
# User Jan Kanis <jan.code@jankanis.nl>
# Date 1403621345 -7200
# Node ID 24deecb59ce9991cd4b2b129ffbb923590f7c855
# Parent  4340432b7191b7c0e356966792d0ddd14a538d74# Parent  62aac637dd6cd76985e6f958d5cdc8670b314cd6
merge py2.6 branch