Checkout
firemeteor
committed
on 01 Jul 08
On the issue-2843-dev branch.

Merged from trunk r31359:r31939 to catch up.