Second attempt at r10124. The last commit contained no code changes!
Authored by: bugman 2010-01-07
Parent: [r10124]
Child: [r10126]