Checkout
Jim Jagielski
committed
on 31 Aug 09
More trunk backporting