Checkout
Jim Jagielski
committed
on 04 Feb 16
Merge r1726888 from trunk:

Fix some duplicate definitions
Submitted by: mrumph
Reviewed/backported by: jim