ref: b7918d52403ac97ed524c306f02e8c030e26e98b
parent: f4020e2338a1786b1db0f67075ceb7d9c01be6a3
parent: 0b94f5d6e827c0b4d6b2590592be4285f60c8477
author: John Koleszar <jkoleszar@google.com>
date: Tue Aug 31 11:56:52 EDT 2010
Merge remote branch 'internal/upstream' into HEAD Conflicts: configure