Merge branch 'next'
    
    Conflicts:
    	ipython.spec
    
    This updates ipython to version 2.1.0 in rawhide.
    I was forced to use a changelog date later than the last rebuilt
    bump even though, I changed ipython to version 1 and then to 2 in
    the side branch...