Comment 4 for bug 291143

Fix committed in my dev branch:

https://code.launchpad.net/~fdo.perez/ipython/trunk-dev

Unless we spot any problems here, I'll go ahead and merge this into trunk/0.10 for release. I'd appreciate a quick eye over the changes, they are minimal.