Sorry but I couldn't make the 'svn diff' from the root because I have a bunch of other changes going on at the same time.
I'm not going to have any time in the next couple of days to look at the Content classes to cut them over. Is there anybody that might possibly be able to? Looking at the EmailServices.java class, the code changes that I've already done should provide a good example of how to do it.
