Merge with 5981ad8547f5bcfe2e9c93b7973fbca79178487f

2009-10-28, greg