Merge "Allow --cpu= to work for x86."
authorFritz Koenig <frkoenig@google.com>
Wed, 25 Aug 2010 18:39:59 +0000 (11:39 -0700)
committerCode Review <code-review@webmproject.org>
Wed, 25 Aug 2010 18:39:59 +0000 (11:39 -0700)

Trivial merge