ref: d7c6c9472f6b36a6615e9225322a737169b73451
parent: 3ce5adb15434556f15e6388b535c988515d40e56
parent: 7985e023ebd83351b670bf5b18060f4d391b3a64
author: John Koleszar <jkoleszar@google.com>
date: Mon Jun 27 20:05:04 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD