created branch from maintenance-2.2 r6474 (task 145412)
Authored by: cwilper 2008-01-11
Parent: [r6505]
Child: [r6507]