tree ce26fc667aad0f0926519de77d3847d2c97c1d92
parent 393ce88261bbdbf681c1043d57f2116910fe8a12
author Igor Sysoev <igor@sysoev.ru> 1241984954 +0000
committer Igor Sysoev <igor@sysoev.ru> 1241984954 +0000

backout -r2827 and add correct fix