Automerging change r10363 from trunk to branches/8.2.0
------------------------------------------------------------------------
r10363 | jhixson | 2012-02-29 15:51:27 -0800 (Wed, 29 Feb 2012) | 3 lines
OOps, I left in some syslog's that hopefully nobody ever sees.