failing junit tests

[Tore Halset]

Hello.

Sorry, but my cayenne-jdk1.5-unpublished/src/test/java/org/apache/ 
cayenne/merge/MergerFactoryTest.java are making lots of other junit  
tests fail. Probably as it changes the model a lot..

I will try to fix it. Sorry.

Regards,
 - Tore.