Fix a couple of bugs.
treecc915f3777b12464f61c2ee61a21cfd92384d362
-rwxr-xr-x 15337 svn-merge2git.sh