Checkout
Jim Jagielski
committed
on 28 Nov 11
Merge r1207282 from trunk:

Error-check.
Reviewed/backported by: jim