http://cecontentwiz.codeplex.com

Facilitates adding content to an OS image and setting up shortcuts.  Registry files can be merged as well.