ref: feea724296f02bdd9a32597e42b13decd1a4cd10
parent: 64677e27228d5649b0a85e8f039259fd00ef621c
parent: e529a825f7e23233ec7757abc78b65b40a2c8bf2
author: John Koleszar <jkoleszar@google.com>
date: Mon Sep 19 20:05:04 EDT 2011
Merge remote branch 'internal/upstream' into HEAD