merge of fcrepo-254 r7719:7777 to trunk
Authored by: pangloss 2008-10-15
Parent: [r7780]
Child: [r7782]