ref: f36f66cd37a7561a7441b97b15aaf636f21679b7
parent: e4f38c88da624a1634472e761dcb381ce3b95826
parent: 60dc7375afe21bd83d5c395bdf233d7a068fc2c9
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Jun 26 07:58:16 EDT 2013
Merge "fixed a compiling problem with MSVC win32 build"