created branch from maintenance-2.2 r6474 (task 145635)
Authored by: pangloss 2008-01-23
Parent: [r6514]
Child: [r6516]