ref: de4b3352b86c9770435995f28d9a1a25c93c305f
parent: 7488245b8b600aca0be93867ac9a8e5b054c3e02
parent: f3cb9ae459ab9c1883b7186eb10a6da0598716fc
author: John Koleszar <jkoleszar@google.com>
date: Mon Jan 31 04:11:52 EST 2011
Merge remote branch 'internal/upstream' into HEAD Conflicts: configure Change-Id: I74063d859de31a62285c8908bcb1821e050b9f3c