Commit of recent trunk merge.

config/linux2-config.py

...etCollision/NarrowPhaseCollision/btPersistentManifold.cpp

intern/SoundSystem/make/msvc_6_0/SoundSystem.dsp

intern/SoundSystem/make/msvc_6_0/dummy/DummySoundSystem.dsp

...rn/SoundSystem/make/msvc_6_0/openal/OpenALSoundSystem.dsp

intern/bmfont/make/msvc_6_0/bmfont.dsp

intern/bmfont/make/msvc_6_0/bmfont.dsw

intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp

intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw

intern/boolop/intern/BOP_Merge2.cpp

intern/boolop/intern/BOP_Misc.h

intern/boolop/make/msvc_6_0/boolop.dsp

intern/bsp/make/msvc6_0/bsplib.dsp

intern/bsp/make/msvc6_0/bsplib.dsw

intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp

intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw

intern/container/make/msvc_6_0/container.dsp

intern/container/make/msvc_6_0/container.dsw

intern/decimation/make/msvc_6_0/decimation.dsp

intern/decimation/make/msvc_6_0/decimation.dsw