Restored support for Mac OS X 10.6.

Modified during merge.