* contrib/client-side/svnmerge/svnmerge.py   move import of popen2 to the version of launch() used when subprocess   is not available, since popen2 is deprecated in Python-2.6
* contrib/client-side/svnmerge/svnmerge.py
  move import of popen2 to the version of launch() used when subprocess
  is not available, since popen2 is deprecated in Python-2.6

Suggested by: giovannibajo
Patch by: Jon Schewe <jpschewe@mtu.net>
Review by: me

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion