ref: eb6d3a1ead99dc62536dd839356af623f138951a
parent: e786bd3a01e60eee98b0fb3cf09fc58f66742eab
parent: 9e95a1a0cd3bfe435463c3ba3798ec093215b7e9
author: John Koleszar <jkoleszar@google.com>
date: Wed Feb 16 19:05:14 EST 2011
Merge remote branch 'internal/upstream-experimental' into HEAD