The Manicured Fennel Thief Returns

So it turns out this guy was really one of these.  An old world Swallowtail or Papilio Machaon.

You can see it in all it's glory starting here on Flickr and some shots of a mantis too if you click back a few.  The blip is not of the exact caterpillar that turned in to this butterfly but I got a shot of the actual one too, here.