ref: bf53e74b7f23cd9e55aaf820d7914b0890a16177
parent: b3b34b0bc712f247936ec69d62ca3d12e3444e7a
parent: 2614b77fcb415d37383fbd970bddc29785f7cc74
author: John Koleszar <jkoleszar@google.com>
date: Tue Jul 19 20:05:08 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD