Merging in changes from trunk to fcrepo-648
Authored by: barmintor 2010-09-13
Parent: [r8798]
Child: [r8800]