ref: 779d3c54dffaf461ccff59d3b57d5eda0842db0a
parent: a2bca1a52db0a26ca71d2f686d4a2b26636011b7
parent: 76878a0354d9520d6029dc62384f0fe55b8cedc6
author: John Koleszar <jkoleszar@google.com>
date: Tue Feb 1 19:05:14 EST 2011
Merge remote branch 'internal/upstream-experimental' into HEAD