Commit d046945cefc34c8caafde53e20e1a064576e587e

nulltoken 2012-06-22T16:42:37

Fix MSVC compilation errors