merge in traceroute1.4a12. Our sources are so different that it is reallydifficult to do this with an import.
branches: 1.1.1;Initial revision