ref: cc63deba313e2e281bb1fdbe041ae8be13f1a3e0
parent: c55589124976a9b4dfdbecbebe704d77e08d8cd5
parent: e529a825f7e23233ec7757abc78b65b40a2c8bf2
author: John Koleszar <jkoleszar@google.com>
date: Mon Sep 19 20:05:04 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I717768a6b248bd4ae3a96f711287758ba78a384a