r31948, r31949

[rgheck]

These two patches take different approaches to solving the same problem. 
Alex's is correct, so I am committing it to trunk, too.

Pavel, as he said, accidentally committed it to branch, too, but it is OK.

Richard