Just got back from my morning coffee. Intrepid is right; it's the Martime Museum in Greenwich.

Been there twice. Anybody that visits London should include a tour of the Maritime Museum; it's fantastic with past and current displays including Lord Nelson, the Beagle, and even a large model of a Princess ship.