Media Monkey should do that just fine. Actually by default it overlaps a couple seconds going from one song to the next. This is adjustable to your taste.