Checkout
gsmith
committed
on 19 Nov 11
backport r1203924 from trunk