Changes for ipython 1.x