ref: a4a554e0caebf9998ceab40acdb75db707c0adc3
parent: 77058ad62bcdc4fe08bc0ee1b3c1045d19d2e826
parent: d64aa018be236d4c87029b292739ae96df2cb7fb
author: John Koleszar <jkoleszar@google.com>
date: Wed Apr 6 20:05:06 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD