Merge "fix --disable-runtime-cpu-detect on x86"
authorJohn Koleszar <jkoleszar@google.com>
Wed, 15 Jun 2011 14:09:09 +0000 (07:09 -0700)
committerCode Review <code-review@webmproject.org>
Wed, 15 Jun 2011 14:09:09 +0000 (07:09 -0700)

Trivial merge