Including python-2.6 libs from master