ref: 05be0987486d02f9b104270896ea77b60849c3e0
parent: 2dc04461f26b749cee78b8834c066316031b0107
parent: 757a45f3ebcb62ae1262c80f68eee447d6788de5
author: John Koleszar <jkoleszar@google.com>
date: Thu Jan 13 06:35:00 EST 2011
Merge remote branch 'internal/upstream-experimental' into HEAD