Wed Sep 21 14:21:54 EDT 2011 geoff merging it with our version.