> And where's the actual merge?  The attached diff has hardly anything in it.

attached the complete diff, including all generated files (minus the .class files).