VS2010 build: Fixed bad merging.