Merge proposals dependent on lp:~jorgen-stenarson/ipython/ipython-py2exe-fix

lp:~jorgen-stenarson/ipython/ipython-py2exe-fix has no merge proposals.