Merge in FCREPO-648 - Integration with Spring
Authored by: birkland 2010-11-19
Parent: [r8832]
Child: [r8834]