ref: 186f3623d4bd28f8c2823767e708909704d0086e
parent: 52913b17fd66540fc93cc22bddc0b66124a62286
parent: 1f5d91d92e9414b67e42e01ba160363cdc2de0fa
author: John Koleszar <jkoleszar@google.com>
date: Thu Dec 16 19:05:10 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD