ref: 6dfec43bfda7ab411078e1cd6bbdb930a0c225fe
parent: 9b9ecb38de0ce0a4b81506799217619d166c61b1
parent: 9a7b92ebe748423432b92d8ad4d25d8a8a879391
author: John Koleszar <jkoleszar@google.com>
date: Fri Jan 14 19:05:20 EST 2011
Merge remote branch 'internal/upstream-experimental' into HEAD