I've just finished cloning my Mk1 onto the Mk2, and it looks like the contents of the Mk1 are intact, so no worries there.

Geoff
---- -------
Got one of the first Mark 2 empegs...
_________________________
Geoff
---- -------
Mk1 Blue - was 4GB, now 16GB
Mk2 Red - was 12GB, now 60GB