Merged r8657:8672 into trunk from fcrepo-683 and fcrepo 685
Authored by: blekinge 2010-06-26
Parent: [r8673]
Child: [r8675]