ref: 6c0f7e3ae758ec9faae0890d2399e50b335a1d75
parent: 7e3d1b4fe5e846dcd6e94906846c1fdbbb4e1554
parent: 76eb1b0519ba58a650205dd35779e55857695b0f
author: John Koleszar <jkoleszar@google.com>
date: Tue Jan 18 19:05:21 EST 2011
Merge remote branch 'internal/upstream-experimental' into HEAD