I'm afraid I've gone branch-stupid. I have a a few changes that should be on the boat for the next release, but I can't for the life of me remember which branch to push to - right now the changes are on trunk and py3k. -jesse