Merge pull request #2593 from thedax/master

Fix Windows build error
This commit is contained in:
Henrik Rydgård 2013-07-02 13:58:54 -07:00
commit 4202e2857b

Binary file not shown.