Let's try to fix this again... still having problems with Windows building.
Let's try to fix this again... still having problems with Windows building.


git-svn-id: 86a4f41f9d0383640198789122b520d4105b319a@1435 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

Turbo87/mergejs.py