Accidentally blew away Mike's earlier changes.  So, I have now correctly merged both of our changes into this version.
Accidentally blew away Mike's earlier changes.  So, I have now correctly merged both of our changes into this version.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@322750 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 9413f41a30708c582dd626e5bccbcd48f00641ac
ham1/jmeter,apache/jmeter,ham1/jmeter,etnetera/jmeter,etnetera/jmeter,apache/jmeter,ham1/jmeter,etnetera/jmeter,apache/jmeter,apache/jmeter,etnetera/jmeter,benbenw/jmeter,benbenw/jmeter,benbenw/jmeter,ham1/jmeter,benbenw/jmeter,etnetera/jmeter,apache/jmeter,ham1/jmeter