ref: 1f3e814bbfcd1a2f8f6b466fd22532bd3b770c0f
parent: 9f0b9c6378f7fbe705601abed44dd12c5e8522e4
parent: 55864fd530ce8f4f6f682d8cb6452aa3b8d489e9
author: John Koleszar <jkoleszar@google.com>
date: Wed Jan 5 19:05:13 EST 2011
Merge remote branch 'internal/upstream-experimental' into HEAD