Merging from upstream

Fix bzr revno from trunk

Merge Fernando's recent work (see log for details)

Small formatting fixes to address Jorgen's last code review.

Update version numbers for 0.10 dev

Fix %timeit for slow functions, by Prabhu Ramachandran. From his submission on the list: Lets say you have a function that takes 2 seconds to evaluate. With the original code you are going to run that function 10 times regardless of the fact that it already takes 2 seconds and with the original code, timing this will take at least 60 seconds (with repeat=3) which is way too much.

more details (comments) on unicode bug

Merging from upstream

Use len and str from builtins in computing dynamic prompts. Closes: https://bugs.launchpad.net/bugs/355837

Work again on bug 269966. I think this time we do have a robust fix. I added tests that do fail after John Hunter's example, so if this one ever tries to return, we should catch it right away. Very, very nasty bug...