[MERGE] Fix for running parallel tests on Mac OS X

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Szakmeister wrote:
> Attached you'll find a patch that enables the test suite to determine
> the level of concurrency to use when running on a Mac.
> 
> -John

The change looks fine to me. Vincent can you run this on one of your
Mac's and make sure it works?

BB:approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkomfpMACgkQJdeBCYSNAAPzygCeNJmUHJ/8z3W9MhYQz3bv1BBH
9wYAnjgdtoj78lNLF7aSQnoq4ATp/+uN
=3dAU
-----END PGP SIGNATURE-----