ref: 766fce16c42ac11c9cf08731ac5d73376d420743
parent: 9dfd0060176ad0d6f5beb465ae75a67584169acd
parent: ae8aa836d5a4c81e680d035f84eeed4dc8e4c765
author: John Koleszar <jkoleszar@google.com>
date: Thu Jun 30 20:05:11 EDT 2011
Merge remote branch 'internal/upstream' into HEAD