ref: 891df506f21dd118f4e7e5cf09b02819bcb1e48e
parent: 8faec020dcac776547d4303039565ea096299ea0
parent: 7c3e704e6d1de71115b688615b63fc737d0514db
author: John Koleszar <jkoleszar@google.com>
date: Thu Dec 23 19:05:10 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD