Never one to fear displaying my ignorance / laziness...

In my limited readings, I had gotten the vague impression that OSC was sort of MIDI 2.0.  Does MIDI 2.0 incorporate OSC or will they remain two distinct paths?