ref: a4975c629d512066df297148fc891aec3b8e6ec3
parent: c540bbc3679f5b3fcfaeb8449196a9d0b56fdba1
parent: 9683198e7b97b3e1f5b56bdc2d66a1b1e17a1209
author: John Koleszar <jkoleszar@google.com>
date: Tue Feb 8 19:05:15 EST 2011
Merge remote branch 'internal/upstream-experimental' into HEAD