Rob Di Marco - 2008-09-20

Patch to handle @OneToOne during data loading