ref: bf9f23be457392c1e7d67fcfc1baae077febab68
parent: 180b0306cc637af5bbb7def58f59875f17c69f29
parent: 1765040a26d55dc9a51cc6d89892022ed2c3203b
author: John Koleszar <jkoleszar@google.com>
date: Thu Aug 25 20:05:05 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD