Created branch from trunk r8528, for move to DI framework
Authored by: cwilper 2010-03-08
Parent: [r8528]
Child: [r8530]