merge of dev-2075351 r7684:7725 to maintenance-2.2
Authored by: pangloss 2008-09-24
Parent: [r7732]
Child: [r7734]