Keep in mind that the trailer doesn't necessarily involve putting things in the correct order, in fact I think they deliberately throw things around to put things out of synch.
Certain things we know from the trailer.
The mero wants the oracle's eyes in exchange for Neo (why we do not know)
Some hobo smacks up Neo (former one maybe?)
Neo talks to what seems to be the AI leader.
Neo seems to be blind (and it seems there is blood above the blindfold, like he had cut out his eyes...)
Neo is in some psuedo (orange) middle world killing Sentinels.
Now, what order would this probably take place?
I can't help but think the sentinel killing spree is after all the mero stuff, and he's trying to get to the one member of the AI whose not completely dictated by preset instructions.
I'm guessing he requires the AI to recondition the matrix to create suitable environmental conditions for him to defeat smith for good, you see a machine plugging Neo into the matrix (those weird prongy things look like the machine that unplugged him in the first 1, not like the human pirate connections)