ref: 6f980c6a1e7e0f4c1436f8cb4527e2239f4cd906
parent: 2886b91790a45abc6bbaa337ea81d0510c466721
parent: a8083449e9ab7aca6f5c807fafdbd6ad7324f24a
author: James Zern <jzern@google.com>
date: Fri Sep 5 07:58:55 EDT 2014
Merge "fix x86-darwin* build"