merge of dev-149665 (r7421:7436) to maintenance-2.2
Authored by: pangloss 2008-07-08
Parent: [r7437]
Child: [r7439]