* Merge with edge-vector-mergepoint-20040918.