Merges changes from the fcrepo-391 to fedora-rest
Authored by: bbranan 2009-04-27
Parent: [r7997]
Child: [r7999]