Sorry, for technical reasons I could not answer your question earlier.

There were at least two Caravaggios there, although this was in my nearly-stoned from sensory overload situation, so after a little post-event research:
Most of the images are not loading fast enough for me, and I'm not sure if it's my side or Prado's at fault but the Prado has searchable galleries online, and Caravaggio pulls out a bunch of hits. (http://www.museodelprado.es/index.php?id=995&no_cache=1&L=0&tx_obras[adv]=)