Checkout
rjung
committed
on 31 Jan 12
Updates.

Backport of r1201450 from trunk.