ref: eec30c891dd6c8bbe90ba8f518210dc48ce9224e
parent: 871bd23e4c41bb0fb94b72832b270766de540dea
parent: 92963df086fc629859e4d51d2b4098ea8691c249
author: John Koleszar <jkoleszar@google.com>
date: Mon May 14 08:06:08 EDT 2012
Merge "fix warnings for building on win32"