Windows build fix.

The last 4 commits (including this one) were all http://codereview.appspot.com/5823061/.
(git svn mishap)



git-svn-id: http://rlz.googlecode.com/svn/trunk@93 10bc0f33-e4bf-9a86-80cf-af638054f0c4