- David Miller: sparc and net updates. Fix merge_segments.