Last week I spent one week in Wien, I make a visit to the historical museum of Wien and it naval part. 7 pages of photos (124) , sorry for the quality but the usage of flash is forbidden.
http://mon-serveur.org/wien/thumbnails.php?album=2
check also the WW1 and WW2 section :
http://mon-serveur.org/wien/