ref: bbd5cb2bd4c348a3a033c211346e13ee1f1f6496
parent: 495ff8e0c7c862c3227551f4d87a1f2455a79a45
parent: 4524548f80efd35ffd9f65ad3b86717bba9b98bd
author: Johann <johannkoenig@google.com>
date: Wed Jun 12 09:36:50 EDT 2013
Merge "Fix compile warnings on windows."