Trying to fix 3097422, difference between 4.2 and 4.0
Authored by: artyom-beilis 2010-10-29
Parent: [r1496]
Child: [r1498]