Neale Ferguson - 2009-09-03

Diffs used to get clean build on OpenSolaris