Merged r14923 into trunk branch.

Fix windows build.

R=rossberg@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/16336006

git-svn-id: https://v8.googlecode.com/svn/trunk@14924 ce2b1a6d-e550-0410-aec6-3dcde31c8c00