tree 35dfe95cb0b60f7a88573f3b5e2c4b99a31e2518
parent af9bb9a14e391cacac915d7ce09a0ac9317d0621
author Igor Sysoev <igor@sysoev.ru> 1218542689 +0000
committer Igor Sysoev <igor@sysoev.ru> 1218542689 +0000

backout both r2162 and r2128 and implement a new fix