svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78996 | martin.v.loewis | 2010-03-16 19:49:28 +0100 (Di, 16 Mär 2010) | 1 line

  Integrate merge.py into msi.py.
........